Changeset 22883 in vbox for trunk/src/VBox/Frontends/VirtualBox/shaders

Timestamp:

Sep 9, 2009 9:26:01 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

52139

Message:

fideo hw accel: fix for ATI + small optimizations

Location:

trunk/src/VBox/Frontends/VirtualBox/shaders

Files:

• cconvAYUV.c (modified) (1 diff)
• cconvAYUV_void.c (modified) (1 diff)
• cconvBGR.c (modified) (1 diff)
• cconvBGR_void.c (modified) (1 diff)
• cconvUYVY.c (modified) (1 diff)
• cconvUYVY_void.c (modified) (1 diff)
• cconvYUY2.c (modified) (1 diff)
• cconvYUY2_void.c (modified) (1 diff)
• cconvYV12.c (modified) (1 diff)
• cconvYV12_void.c (modified) (1 diff)
• ckeyDst.c (modified) (1 diff)
• ckeyDst2.c (added)
• ckeyDst_void.c (modified) (1 diff)
• mainOverlay.c (modified) (1 diff)
• mainOverlayNoCKey.c (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/shaders/cconvAYUV.c

@@ -2 +2 @@
 uniform sampler2DRect uSrcTex;
 void vboxCConvApplyAYUV(vec4 color);
-void vboxCConv(int srcI)
+void vboxCConv()
 {
-    vec2 srcCoord = vec2(gl_TexCoord[srcI]);
+    vec2 srcCoord = vec2(gl_TexCoord[0]);
     vec4 color = texture2DRect(uSrcTex, srcCoord);
     vboxCConvApplyAYUV(color);

trunk/src/VBox/Frontends/VirtualBox/shaders/cconvAYUV_void.c

@@ -1 @@
-void vboxCConv(int srcI)
+void vboxCConv()
 {}

trunk/src/VBox/Frontends/VirtualBox/shaders/cconvBGR.c

@@ -1 +1 @@
 #extension GL_ARB_texture_rectangle : enable
 uniform sampler2DRect uSrcTex;
-void vboxCConv(int srcI)
+void vboxCConv()
 {
-    vec2 srcCoord = vec2(gl_TexCoord[srcI]);
-    gl_FragColor = texture2DRect(uSrcTex, vec2(srcCoord.x, srcCoord.y));
+    vec2 srcCoord = vec2(gl_TexCoord[0]);
+    gl_FragColor = texture2DRect(uSrcTex, srcCoord);
 }

trunk/src/VBox/Frontends/VirtualBox/shaders/cconvBGR_void.c

@@ -1 @@
-void vboxCConv(int srcI)
+void vboxCConv()
 {}

trunk/src/VBox/Frontends/VirtualBox/shaders/cconvUYVY.c

@@ -2 +2 @@
 uniform sampler2DRect uSrcTex;
 void vboxCConvApplyAYUV(vec4 color);
-void vboxCConv(int srcI)
+void vboxCConv()
 {
-    vec2 srcCoord = vec2(gl_TexCoord[srcI]);
+    vec2 srcCoord = vec2(gl_TexCoord[0]);
     float x = srcCoord.x;
-    vec4 srcClr = texture2DRect(uSrcTex, vec2(x, srcCoord.y));
+    vec4 srcClr = texture2DRect(uSrcTex, srcCoord);
     float u = srcClr.b;
     float v = srcClr.r;

trunk/src/VBox/Frontends/VirtualBox/shaders/cconvUYVY_void.c

@@ -1 @@
-void vboxCConv(int srcI)
+void vboxCConv()
 {}

trunk/src/VBox/Frontends/VirtualBox/shaders/cconvYUY2.c

@@ -2 +2 @@
 uniform sampler2DRect uSrcTex;
 void vboxCConvApplyAYUV(vec4 color);
-void vboxCConv(int srcI)
+void vboxCConv()
 {
-    vec2 srcCoord = vec2(gl_TexCoord[srcI]);
+    vec2 srcCoord = vec2(gl_TexCoord[0]);
     float x = srcCoord.x;
     vec4 srcClr = texture2DRect(uSrcTex, vec2(x, srcCoord.y));

trunk/src/VBox/Frontends/VirtualBox/shaders/cconvYUY2_void.c

@@ -1 @@
-void vboxCConv(int srcI)
+void vboxCConv()
 {}

trunk/src/VBox/Frontends/VirtualBox/shaders/cconvYV12.c

@@ -5 +5 @@
 float vboxSplitBGRA(vec4 color, float coord);
 void vboxCConvApplyAYUV(vec4 color);
-void vboxCConv(int srcI)
+void vboxCConv()
 {
-    vec2 coordY = vec2(gl_TexCoord[srcI]);
-    vec2 coordV = vec2(gl_TexCoord[srcI+1]);
-    vec2 coordU = vec2(gl_TexCoord[srcI+2]);
+    vec2 coordY = vec2(gl_TexCoord[0]);
+    vec2 coordV = vec2(gl_TexCoord[1]);
     vec4 clrY = texture2DRect(uSrcTex, vec2(coordY));
     vec4 clrV = texture2DRect(uVTex, vec2(coordV));
-    vec4 clrU = texture2DRect(uUTex, vec2(coordU));
+    vec4 clrU = texture2DRect(uUTex, vec2(coordV));
     float y = vboxSplitBGRA(clrY, coordY.x);
     float v = vboxSplitBGRA(clrV, coordV.x);
-    float u = vboxSplitBGRA(clrU, coordU.x);
+    float u = vboxSplitBGRA(clrU, coordV.x);
     vboxCConvApplyAYUV(vec4(u, y, 0.0, v));
 }

trunk/src/VBox/Frontends/VirtualBox/shaders/cconvYV12_void.c

@@ -1 @@
-void vboxCConv(int srcI)
+void vboxCConv()
 {}

trunk/src/VBox/Frontends/VirtualBox/shaders/ckeyDst.c

@@ -2 +2 @@
 uniform sampler2DRect uDstTex;
 uniform vec4 uDstClr;
-int vboxCKeyDst(void)
+void vboxCKeyDst(void)
 {
-    vec4 dstClr = texture2DRect(uDstTex, vec2(gl_TexCoord[0]));
+    vec4 dstClr = texture2DRect(uDstTex, vec2(gl_TexCoord[1]));
     vec3 difClr = dstClr.rgb - uDstClr.rgb;
     if(any(greaterThan(difClr, vec3(0.01, 0.01, 0.01)))
         || any(lessThan(difClr, vec3(-0.01, -0.01, -0.01))))
             discard;
-    return 1;
 }

trunk/src/VBox/Frontends/VirtualBox/shaders/ckeyDst_void.c

@@ -1 @@
-int vboxCKeyDst(void)
+void vboxCKeyDst(void)
 {
-    return 0;
 }

trunk/src/VBox/Frontends/VirtualBox/shaders/mainOverlay.c

@@ -1 @@
-int vboxCKeyDst(void);
-void vboxCConv(int srcI);
+void vboxCKeyDst(void);
+void vboxCConv();
 void main(void)
 {
-        int srci = vboxCKeyDst();
-        vboxCConv(srci);
+    vboxCKeyDst();
+    vboxCConv();
 }

trunk/src/VBox/Frontends/VirtualBox/shaders/mainOverlayNoCKey.c

@@ -1 @@
-void vboxCConv(int srcI);
+void vboxCConv();
 void main(void)
 {
-    vboxCConv(0);
+    vboxCConv();
 }