diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-02 23:45:16 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-02 23:45:16 +0000 |
| commit | f78ac522f8fc1463797b4de6831f9f0ee58566f8 (patch) | |
| tree | b683be43f4ce2aa22198e2ede71497bb41265ec6 /content/browser/renderer_host/compositing_iosurface_shader_programs_mac.cc | |
| parent | 2f19a0632eb3212d3b230f5de41ae2004e15056c (diff) | |
| download | chromium_src-f78ac522f8fc1463797b4de6831f9f0ee58566f8.zip chromium_src-f78ac522f8fc1463797b4de6831f9f0ee58566f8.tar.gz chromium_src-f78ac522f8fc1463797b4de6831f9f0ee58566f8.tar.bz2 | |
Separate CompositingIOSurface from its GL context
This is towards making all CompositingIOSurfaces in a window
to share a single GL context.
BUG=180463
Review URL: https://chromiumcodereview.appspot.com/13363002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/compositing_iosurface_shader_programs_mac.cc')
| -rw-r--r-- | content/browser/renderer_host/compositing_iosurface_shader_programs_mac.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/content/browser/renderer_host/compositing_iosurface_shader_programs_mac.cc b/content/browser/renderer_host/compositing_iosurface_shader_programs_mac.cc index 40575df..12988a1 100644 --- a/content/browser/renderer_host/compositing_iosurface_shader_programs_mac.cc +++ b/content/browser/renderer_host/compositing_iosurface_shader_programs_mac.cc @@ -332,13 +332,12 @@ void CompositingIOSurfaceShaderPrograms::Reset() { texel_scale_x_var_locations_[i] = -1; } -bool CompositingIOSurfaceShaderPrograms::UseBlitProgram( - int texture_unit_offset) { +bool CompositingIOSurfaceShaderPrograms::UseBlitProgram() { const GLuint program = GetShaderProgram(SHADER_PROGRAM_BLIT); if (program == 0u) return false; glUseProgram(program); - BindUniformTextureVariable(SHADER_PROGRAM_BLIT, texture_unit_offset); + BindUniformTextureVariable(SHADER_PROGRAM_BLIT, 0); return true; } @@ -351,7 +350,7 @@ bool CompositingIOSurfaceShaderPrograms::UseSolidWhiteProgram() { } bool CompositingIOSurfaceShaderPrograms::UseRGBToYV12Program( - int pass_number, int texture_unit_offset, float texel_scale_x) { + int pass_number, float texel_scale_x) { const int which = SHADER_PROGRAM_RGB_TO_YV12__1_OF_2 + pass_number - 1; DCHECK_GE(which, SHADER_PROGRAM_RGB_TO_YV12__1_OF_2); DCHECK_LE(which, SHADER_PROGRAM_RGB_TO_YV12__2_OF_2); @@ -360,7 +359,7 @@ bool CompositingIOSurfaceShaderPrograms::UseRGBToYV12Program( if (program == 0u) return false; glUseProgram(program); - BindUniformTextureVariable(which, texture_unit_offset); + BindUniformTextureVariable(which, 0); if (which == SHADER_PROGRAM_RGB_TO_YV12__1_OF_2) { BindUniformTexelScaleXVariable(which, texel_scale_x); } else { |