Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Unified Diff: client/deps/glbench/src/yuv2rgb_1.glslf

Issue 2757001: Refactored YUV test. (Closed) Base URL: ssh://git@chromiumos-git//autotest.git
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/deps/glbench/src/yuv2rgb.h ('k') | client/deps/glbench/src/yuv2rgb_1.glslv » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/deps/glbench/src/yuv2rgb_1.glslf
diff --git a/client/deps/glbench/src/yuv2rgb_1.glslf b/client/deps/glbench/src/yuv2rgb_1.glslf
index 228e6a934a34a34dc22cf1d7f013a1a813000a67..cf03b131e09d51163f468fe433a2bd297ea9e80d 100644
--- a/client/deps/glbench/src/yuv2rgb_1.glslf
+++ b/client/deps/glbench/src/yuv2rgb_1.glslf
@@ -54,6 +54,10 @@ uniform float imageHeight;
*/
uniform sampler2D textureSampler;
+#if defined (USE_UNIFORM_MATRIX)
+uniform mat4 conversion;
+#endif
+
varying vec4 v1;
/**
@@ -66,7 +70,7 @@ varying vec4 v1;
* trying to render, in parametric coordinates.
*/
float getYPixel(vec2 position) {
- position.y = position.y * 2.0 / 3.0 + 1.0 / 3.0;
+ position.y = 1. - (position.y * 2.0 / 3.0 + 1.0 / 3.0);
return texture2D(textureSampler, position).x;
}
@@ -89,7 +93,7 @@ vec2 mapCommon(vec2 position, float planarOffset) {
floor((imageWidth - 1.0 - position.x) / 2.0);
float x = floor(imageWidth - 1.0 - floor(mod(planarOffset, imageWidth)));
float y = floor(planarOffset / imageWidth);
- return vec2((x + 0.5) / imageWidth, (y + 0.5) / (1.5 * imageHeight));
+ return vec2((x + 0.5) / imageWidth, 1. - (y + 0.5) / (1.5 * imageHeight));
}
/**
@@ -209,10 +213,12 @@ void main() {
* [0,1] to [-.5,.5] as part of the transform.
*/
vec4 channels = vec4(yChannel, uChannel, vChannel, 1.0);
+#if !defined(USE_UNIFORM_MATRIX)
mat4 conversion = mat4( 1.0, 1.0, 1.0, 0.0,
0.0, -0.344, 1.772, 0.0,
1.402, -0.714, 0.0, 0.0,
-0.701, 0.529, -0.886, 1.0);
+#endif
gl_FragColor = conversion * channels;
}
« no previous file with comments | « client/deps/glbench/src/yuv2rgb.h ('k') | client/deps/glbench/src/yuv2rgb_1.glslv » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698