summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/context_group.cc
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 21:45:53 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 21:45:53 +0000
commit84afefae873f53401711a99c0d9881eafa103b40 (patch)
treedd87e112b46a839b3e0be568c965a4dcfb0d1ca7 /gpu/command_buffer/service/context_group.cc
parenteca9f714a207c9f6791430efd681e2940052990c (diff)
downloadchromium_src-84afefae873f53401711a99c0d9881eafa103b40.zip
chromium_src-84afefae873f53401711a99c0d9881eafa103b40.tar.gz
chromium_src-84afefae873f53401711a99c0d9881eafa103b40.tar.bz2
Make command buffer validate glRenderbufferStorage width and height
TEST=unit tests BUG=86815 Review URL: http://codereview.chromium.org/8342023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/context_group.cc')
-rw-r--r--gpu/command_buffer/service/context_group.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc
index 309f4e6..3d580bd 100644
--- a/gpu/command_buffer/service/context_group.cc
+++ b/gpu/command_buffer/service/context_group.cc
@@ -63,10 +63,15 @@ bool ContextGroup::Initialize(const DisallowedFeatures& disallowed_features,
GLint max_renderbuffer_size = 0;
glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, &max_renderbuffer_size);
+ GLint max_samples = 0;
+ if (feature_info_.feature_flags().chromium_framebuffer_multisample) {
+ glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
+ }
buffer_manager_.reset(new BufferManager());
framebuffer_manager_.reset(new FramebufferManager());
- renderbuffer_manager_.reset(new RenderbufferManager(max_renderbuffer_size));
+ renderbuffer_manager_.reset(new RenderbufferManager(
+ max_renderbuffer_size, max_samples));
shader_manager_.reset(new ShaderManager());
program_manager_.reset(new ProgramManager());