diff options
author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 14:27:06 +0000 |
---|---|---|
committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 14:27:06 +0000 |
commit | ef29778ad0b2f9f4ba7ec1286999784518746a45 (patch) | |
tree | 0537f48d83e2d991138b208a90d3f1cf519f1bac | |
parent | 99737847fa07c0d15469b6d4fb02b9ccc55429a6 (diff) | |
download | chromium_src-ef29778ad0b2f9f4ba7ec1286999784518746a45.zip chromium_src-ef29778ad0b2f9f4ba7ec1286999784518746a45.tar.gz chromium_src-ef29778ad0b2f9f4ba7ec1286999784518746a45.tar.bz2 |
Uncommented out precision statements now that glsl translator is enabled. This also fixes Pepper3D ui-test.
BUG=44603
Review URL: http://codereview.chromium.org/2105012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47793 0039d316-1c4b-4281-b951-d872f2087c98
8 files changed, 8 insertions, 16 deletions
diff --git a/chrome/test/ui/pepper_uitest.cc b/chrome/test/ui/pepper_uitest.cc index fac4e1e..5810467 100644 --- a/chrome/test/ui/pepper_uitest.cc +++ b/chrome/test/ui/pepper_uitest.cc @@ -35,9 +35,8 @@ class PepperTester : public NPAPITesterBase { // Test that a pepper 3d plugin loads and renders. // TODO(alokp): Enable the test after making sure it works on all platforms // and buildbots have OpenGL support. -// Fails on XP Build. http://crbug.com/44603 #if defined(OS_WIN) -TEST_F(PepperTester, FAILS_Pepper3D) { +TEST_F(PepperTester, Pepper3D) { const FilePath dir(FILE_PATH_LITERAL("pepper")); const FilePath file(FILE_PATH_LITERAL("pepper_3d.html")); GURL url = ui_test_utils::GetTestUrl(dir, file); diff --git a/third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.c b/third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.c index 4ef9a6b..b884e8d 100644 --- a/third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.c +++ b/third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.c @@ -29,9 +29,8 @@ int stInit ( ESContext *esContext ) " gl_Position = a_position; \n" "} \n"; - // TODO(alokp): Shaders containing "precision" do not compile. GLbyte fShaderStr[] = - "//precision mediump float; \n" + "precision mediump float; \n" "uniform vec4 u_color; \n" "void main() \n" "{ \n" diff --git a/third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.c b/third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.c index 3094c14..c57af1c 100644 --- a/third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.c +++ b/third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.c @@ -33,9 +33,8 @@ int htInit ( ESContext *esContext ) " gl_Position = vPosition; \n" "} \n"; - // TODO(alokp): Shaders containing "precision" do not compile. GLbyte fShaderStr[] = - "//precision mediump float; \n" + "precision mediump float; \n" "void main() \n" "{ \n" " gl_FragColor = vec4 ( 1.0, 0.0, 0.0, 1.0 );\n" diff --git a/third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.c b/third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.c index 90be08a..108aade 100644 --- a/third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.c +++ b/third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.c @@ -35,9 +35,8 @@ int svsInit ( ESContext *esContext ) " gl_Position = u_mvpMatrix * a_position; \n" "} \n"; - // TODO(alokp): Shaders containing "precision" do not compile. GLbyte fShaderStr[] = - "//precision mediump float; \n" + "precision mediump float; \n" "void main() \n" "{ \n" " gl_FragColor = vec4( 1.0, 0.0, 0.0, 1.0 ); \n" diff --git a/third_party/gles2_book/Chapter_9/MipMap2D/MipMap2D.c b/third_party/gles2_book/Chapter_9/MipMap2D/MipMap2D.c index f45d214..eb288fc 100644 --- a/third_party/gles2_book/Chapter_9/MipMap2D/MipMap2D.c +++ b/third_party/gles2_book/Chapter_9/MipMap2D/MipMap2D.c @@ -204,9 +204,8 @@ int mmInit ( ESContext *esContext ) " v_texCoord = a_texCoord; \n" "} \n"; - // TODO(alokp): Shaders containing "precision" do not compile. GLbyte fShaderStr[] = - "//precision mediump float; \n" + "precision mediump float; \n" "varying vec2 v_texCoord; \n" "uniform sampler2D s_texture; \n" "void main() \n" diff --git a/third_party/gles2_book/Chapter_9/Simple_Texture2D/Simple_Texture2D.c b/third_party/gles2_book/Chapter_9/Simple_Texture2D/Simple_Texture2D.c index d764361..12200fd 100644 --- a/third_party/gles2_book/Chapter_9/Simple_Texture2D/Simple_Texture2D.c +++ b/third_party/gles2_book/Chapter_9/Simple_Texture2D/Simple_Texture2D.c @@ -71,9 +71,8 @@ int stInit ( ESContext *esContext ) " v_texCoord = a_texCoord; \n" "} \n"; - // TODO(alokp): Shaders containing "precision" do not compile. GLbyte fShaderStr[] = - "//precision mediump float; \n" + "precision mediump float; \n" "varying vec2 v_texCoord; \n" "uniform sampler2D s_texture; \n" "void main() \n" diff --git a/third_party/gles2_book/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c b/third_party/gles2_book/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c index 07fb147..c2c2da3 100644 --- a/third_party/gles2_book/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c +++ b/third_party/gles2_book/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c @@ -98,9 +98,8 @@ int stcInit ( ESContext *esContext ) " v_normal = a_normal; \n" "} \n"; - // TODO(alokp): Shaders containing "precision" do not compile. GLbyte fShaderStr[] = - "//precision mediump float; \n" + "precision mediump float; \n" "varying vec3 v_normal; \n" "uniform samplerCube s_texture; \n" "void main() \n" diff --git a/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c b/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c index af4fb12..5298283 100644 --- a/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c +++ b/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c @@ -105,9 +105,8 @@ int twInit ( ESContext *esContext ) " v_texCoord = a_texCoord; \n" "} \n"; - // TODO(alokp): Shaders containing "precision" do not compile. GLbyte fShaderStr[] = - "//precision mediump float; \n" + "precision mediump float; \n" "varying vec2 v_texCoord; \n" "uniform sampler2D s_texture; \n" "void main() \n" |