From 472d44e8f881f87449d11ba66515d3c1c5e69891 Mon Sep 17 00:00:00 2001 From: egdaniel Date: Thu, 22 Oct 2015 08:20:00 -0700 Subject: Add version string and force highp NDS transfrom to GLSLCaps This also include the use of any() in the shaders. BUG=skia: Committed: https://skia.googlesource.com/skia/+/cef4bce8e260b49bf3417eadbac806cf7d39cdc8 Review URL: https://codereview.chromium.org/1417993004 --- bench/GLInstancedArraysBench.cpp | 2 +- bench/GLVec4ScalarBench.cpp | 2 +- bench/GLVertexAttributesBench.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bench') diff --git a/bench/GLInstancedArraysBench.cpp b/bench/GLInstancedArraysBench.cpp index bf9aaac0bc..ea780f4c4c 100644 --- a/bench/GLInstancedArraysBench.cpp +++ b/bench/GLInstancedArraysBench.cpp @@ -107,7 +107,7 @@ private: /////////////////////////////////////////////////////////////////////////////////////////////////// GrGLuint GLCpuPosInstancedArraysBench::setupShader(const GrGLContext* ctx) { - const char* version = GrGLGetGLSLVersionDecl(*ctx); + const char* version = ctx->caps()->glslCaps()->versionDeclString(); // setup vertex shader GrGLSLShaderVar aPosition("a_position", kVec2f_GrSLType, GrShaderVar::kAttribute_TypeModifier); diff --git a/bench/GLVec4ScalarBench.cpp b/bench/GLVec4ScalarBench.cpp index ed61ce0fbd..490b55ab52 100644 --- a/bench/GLVec4ScalarBench.cpp +++ b/bench/GLVec4ScalarBench.cpp @@ -93,7 +93,7 @@ private: /////////////////////////////////////////////////////////////////////////////////////////////////// GrGLuint GLVec4ScalarBench::setupShader(const GrGLContext* ctx) { - const char* version = GrGLGetGLSLVersionDecl(*ctx); + const char* version = ctx->caps()->glslCaps()->versionDeclString(); // this shader draws fNumStages overlapping circles of increasing opacity (coverage) and // decreasing size, with the center of each subsequent circle closer to the bottom-right diff --git a/bench/GLVertexAttributesBench.cpp b/bench/GLVertexAttributesBench.cpp index f8325e4e77..1051c31a9d 100644 --- a/bench/GLVertexAttributesBench.cpp +++ b/bench/GLVertexAttributesBench.cpp @@ -65,7 +65,7 @@ private: GrGLuint GLVertexAttributesBench::setupShader(const GrGLContext* ctx, uint32_t attribs, uint32_t maxAttribs) { - const char* version = GrGLGetGLSLVersionDecl(*ctx); + const char* version = ctx->caps()->glslCaps()->versionDeclString(); // setup vertex shader GrGLSLShaderVar aPosition("a_position", kVec4f_GrSLType, GrShaderVar::kAttribute_TypeModifier); -- cgit v1.2.3