gpu/command_buffer/service/context_group.cc - Issue 18492005: Add GL_EXT_multisampled_render_to_texture support to command buffer.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/command_buffer/service/context_group.cc

Issue 18492005: Add GL_EXT_multisampled_render_to_texture support to command buffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: some cleanup Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « gpu/command_buffer/common/gles2_cmd_utils.cc ('k') | gpu/command_buffer/service/feature_info.h » ('j') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/context_group.cc

diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc

index bbacc71490fa5023891d021612d00524c5f2a180..90932fbdddc43cf68e849c8c37d3fa1ce00e347d 100644

--- a/gpu/command_buffer/service/context_group.cc

+++ b/gpu/command_buffer/service/context_group.cc

@@ -101,8 +101,14 @@ bool ContextGroup::Initialize(

return false;

}

GLint max_samples = 0;

- if (feature_info_->feature_flags().chromium_framebuffer_multisample) {

- glGetIntegerv(GL_MAX_SAMPLES, &max_samples);

+ if (feature_info_->feature_flags().chromium_framebuffer_multisample ||

+ feature_info_->feature_flags().multisampled_render_to_texture) {

+ if (feature_info_->feature_flags(

+ ).use_img_for_multisampled_render_to_texture) {

+ glGetIntegerv(GL_MAX_SAMPLES_IMG, &max_samples);

+ } else {

+ glGetIntegerv(GL_MAX_SAMPLES, &max_samples);

+ }

}

if (feature_info_->feature_flags().ext_draw_buffers) {