diff options
| author | dcastagna <dcastagna@chromium.org> | 2015-03-12 13:56:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-12 20:56:31 +0000 |
| commit | d20e7d88d4f79c82590a06fe4923c153d0b756ae (patch) | |
| tree | 3e37e90605e2712299fefd8daad6a49535d88a92 /gpu/perftests | |
| parent | 7d3857fcd8fdf9201306e728a19ca74bbfd0bcd4 (diff) | |
| download | chromium_src-d20e7d88d4f79c82590a06fe4923c153d0b756ae.zip chromium_src-d20e7d88d4f79c82590a06fe4923c153d0b756ae.tar.gz chromium_src-d20e7d88d4f79c82590a06fe4923c153d0b756ae.tar.bz2 | |
Remove uniform initialization from vertex shader in gpu_perftests.
Uniform initialization is not supported on Android and Mac.
BUG=466624
Review URL: https://codereview.chromium.org/1003833002
Cr-Commit-Position: refs/heads/master@{#320366}
Diffstat (limited to 'gpu/perftests')
| -rw-r--r-- | gpu/perftests/texture_upload_perftest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gpu/perftests/texture_upload_perftest.cc b/gpu/perftests/texture_upload_perftest.cc index e36fb1b..8541013 100644 --- a/gpu/perftests/texture_upload_perftest.cc +++ b/gpu/perftests/texture_upload_perftest.cc @@ -34,7 +34,7 @@ const int kUploadPerfTestRuns = 100; // clang-format off const char kVertexShader[] = SHADER( - uniform vec2 translation = vec2(0.0, 0.0); + uniform vec2 translation; attribute vec2 a_position; attribute vec2 a_texCoord; varying vec2 v_texCoord; @@ -189,15 +189,15 @@ class TextureUploadPerfTest : public testing::Test { glBindAttribLocation(program_object_, 1, "a_texCoord"); glLinkProgram(program_object_); - translation_location_ = - glGetUniformLocation(program_object_, "translation"); - DCHECK_NE(-1, translation_location_); - GLint linked = -1; glGetProgramiv(program_object_, GL_LINK_STATUS, &linked); CHECK_NE(0, linked); glUseProgram(program_object_); glUniform1i(sampler_location_, 0); + translation_location_ = + glGetUniformLocation(program_object_, "translation"); + DCHECK_NE(-1, translation_location_); + glUniform2f(translation_location_, 0.0f, 0.0f); sampler_location_ = glGetUniformLocation(program_object_, "a_texture"); CHECK_NE(-1, sampler_location_); |