Changeset 48291 in vbox for trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp

Timestamp:

Sep 5, 2013 7:25:47 AM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: fix OSX win8.1 rendering

File:

• trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp (modified) (8 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp

@@ -841 +841 @@
 #define CR_GLSL_STR_V_120 "#version 120\n"
 #define CR_GLSL_STR_EXT_TR "#extension GL_ARB_texture_rectangle : enable\n"
-#define CR_GLSL_STR_TEX2D "texture2D"
-#define CR_GLSL_STR_TEX2DRECT "texture2DRect"
+#define CR_GLSL_STR_2D "2D"
+#define CR_GLSL_STR_2DRECT "2DRect"
 
 #define CR_GLSL_PATTERN_FS_NOALPHA(_ver, _ext, _tex) \
         _ver \
         _ext \
+        "uniform sampler" _tex " sampler0;\n" \
         "void main()\n" \
         "{\n" \
             "vec2 srcCoord = vec2(gl_TexCoord[0]);\n" \
-            "gl_FragData[0].xyz = (" _tex "(0, srcCoord).xyz);\n" \
+            "gl_FragData[0].xyz = (texture" _tex "(sampler0, srcCoord).xyz);\n" \
             "gl_FragData[0].w = 1.0;\n" \
         "}\n"
@@ -865 +866 @@
     {
         if (enmTexTarget == GL_TEXTURE_2D)
-            return CR_GLSL_PATTERN_FS_NOALPHA(CR_GLSL_STR_V_120, "", CR_GLSL_STR_TEX2D);
+            return CR_GLSL_PATTERN_FS_NOALPHA(CR_GLSL_STR_V_120, "", CR_GLSL_STR_2D);
         else if (enmTexTarget == GL_TEXTURE_RECTANGLE_ARB)
-            return CR_GLSL_PATTERN_FS_NOALPHA(CR_GLSL_STR_V_120, CR_GLSL_STR_EXT_TR, CR_GLSL_STR_TEX2DRECT);
+            return CR_GLSL_PATTERN_FS_NOALPHA(CR_GLSL_STR_V_120, CR_GLSL_STR_EXT_TR, CR_GLSL_STR_2DRECT);
 
         crWarning("invalid enmTexTarget %#x", enmTexTarget);
@@ -875 +876 @@
     {
         if (enmTexTarget == GL_TEXTURE_2D)
-            return CR_GLSL_PATTERN_FS_NOALPHA("", "", CR_GLSL_STR_TEX2D);
+            return CR_GLSL_PATTERN_FS_NOALPHA("", "", CR_GLSL_STR_2D);
         else if (enmTexTarget == GL_TEXTURE_RECTANGLE_ARB)
-            return CR_GLSL_PATTERN_FS_NOALPHA("", CR_GLSL_STR_EXT_TR, CR_GLSL_STR_TEX2DRECT);
+            return CR_GLSL_PATTERN_FS_NOALPHA("", CR_GLSL_STR_EXT_TR, CR_GLSL_STR_2DRECT);
 
         crWarning("invalid enmTexTarget %#x", enmTexTarget);
@@ -901 +902 @@
     GLchar * pBuf = NULL;
     GLuint uiProgram = 0;
+    GLint iUniform = -1;
     GLuint uiShader = pCache->pDispatch->CreateShader(GL_FRAGMENT_SHADER);
     if (!uiShader)
@@ -924 +926 @@
 #ifdef DEBUG_misha
         if (compiled)
-            crDebug("compile success:\n-------------------\n%d\n--------\n", pBuf);
+            crDebug("compile success:\n-------------------\n%s\n--------\n", pBuf);
         else
 #endif
         {
-            crWarning("compile FAILURE:\n-------------------\n%d\n--------\n", pBuf);
+            Assert(0);
+            crWarning("compile FAILURE:\n-------------------\n%s\n--------\n", pBuf);
             rc = VERR_NOT_SUPPORTED;
             goto end;
@@ -958 +961 @@
 #ifdef DEBUG_misha
         if (linked)
-            crDebug("link success:\n-------------------\n%d\n--------\n", pBuf);
+            crDebug("link success:\n-------------------\n%s\n--------\n", pBuf);
         else
 #endif
         {
-            crWarning("link FAILURE:\n-------------------\n%d\n--------\n", pBuf);
+            Assert(0);
+            crWarning("link FAILURE:\n-------------------\n%s\n--------\n", pBuf);
             rc = VERR_NOT_SUPPORTED;
             goto end;
@@ -969 +973 @@
 
     Assert(linked);
+
+    iUniform = pCache->pDispatch->GetUniformLocation(uiProgram, "sampler0");
+    if (iUniform == -1)
+    {
+        crWarning("GetUniformLocation failed for sampler0");
+    }
+    else
+    {
+        pCache->pDispatch->Uniform1i(iUniform, 0);
+    }
 
     *puiProgram = uiProgram;
@@ -1088 +1102 @@
 }
 
-VBOXBLITTERDECL(bool) CrGlslNeedsCleanup(CR_GLSL_CACHE *pCache)
+VBOXBLITTERDECL(bool) CrGlslNeedsCleanup(const CR_GLSL_CACHE *pCache)
 {
     return pCache->uNoAlpha2DProg || pCache->uNoAlpha2DRectProg;