Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10827310: Fix a misuse of framebuffer target in GLHelper (2) (Closed) Base URL: https://git.chromium.org/git/chromium/src@git-svn
Patch Set: Fixes, part 2 Created 8 years, 4 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/build_gles2_cmd_buffer.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index fe8961e93e630c0fc8784b7ed32be0925c7b42ce..69f1e135462e1fcbc9626ffc5c026ce289afa8fe 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -1291,10 +1291,10 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
FramebufferManager::FramebufferInfo* info = NULL;
switch (target) {
case GL_FRAMEBUFFER:
- case GL_DRAW_FRAMEBUFFER:
+ case GL_DRAW_FRAMEBUFFER_EXT:
info = bound_draw_framebuffer_;
break;
- case GL_READ_FRAMEBUFFER:
+ case GL_READ_FRAMEBUFFER_EXT:
info = bound_read_framebuffer_;
break;
default:
@@ -2498,7 +2498,7 @@ void GLES2DecoderImpl::DeleteBuffersHelper(
void GLES2DecoderImpl::DeleteFramebuffersHelper(
GLsizei n, const GLuint* client_ids) {
- bool supports_seperate_framebuffer_binds =
+ bool supports_separate_framebuffer_binds =
feature_info_->feature_flags().chromium_framebuffer_multisample;
for (GLsizei ii = 0; ii < n; ++ii) {
@@ -2508,14 +2508,14 @@ void GLES2DecoderImpl::DeleteFramebuffersHelper(
if (framebuffer == bound_draw_framebuffer_) {
bound_draw_framebuffer_ = NULL;
state_dirty_ = true;
- GLenum target = supports_seperate_framebuffer_binds ?
- GL_DRAW_FRAMEBUFFER : GL_FRAMEBUFFER;
+ GLenum target = supports_separate_framebuffer_binds ?
+ GL_DRAW_FRAMEBUFFER_EXT : GL_FRAMEBUFFER;
glBindFramebufferEXT(target, GetBackbufferServiceId());
}
if (framebuffer == bound_read_framebuffer_) {
bound_read_framebuffer_ = NULL;
- GLenum target = supports_seperate_framebuffer_binds ?
- GL_READ_FRAMEBUFFER : GL_FRAMEBUFFER;
+ GLenum target = supports_separate_framebuffer_binds ?
+ GL_READ_FRAMEBUFFER_EXT : GL_FRAMEBUFFER;
glBindFramebufferEXT(target, GetBackbufferServiceId());
}
RemoveFramebufferInfo(client_ids[ii]);
@@ -2525,7 +2525,7 @@ void GLES2DecoderImpl::DeleteFramebuffersHelper(
void GLES2DecoderImpl::DeleteRenderbuffersHelper(
GLsizei n, const GLuint* client_ids) {
- bool supports_seperate_framebuffer_binds =
+ bool supports_separate_framebuffer_binds =
feature_info_->feature_flags().chromium_framebuffer_multisample;
for (GLsizei ii = 0; ii < n; ++ii) {
RenderbufferManager::RenderbufferInfo* renderbuffer =
@@ -2535,14 +2535,14 @@ void GLES2DecoderImpl::DeleteRenderbuffersHelper(
bound_renderbuffer_ = NULL;
}
// Unbind from current framebuffers.
- if (supports_seperate_framebuffer_binds) {
+ if (supports_separate_framebuffer_binds) {
if (bound_read_framebuffer_) {
bound_read_framebuffer_->UnbindRenderbuffer(
- GL_READ_FRAMEBUFFER, renderbuffer);
+ GL_READ_FRAMEBUFFER_EXT, renderbuffer);
}
if (bound_draw_framebuffer_) {
bound_draw_framebuffer_->UnbindRenderbuffer(
- GL_DRAW_FRAMEBUFFER, renderbuffer);
+ GL_DRAW_FRAMEBUFFER_EXT, renderbuffer);
}
} else {
if (bound_draw_framebuffer_) {
@@ -2558,7 +2558,7 @@ void GLES2DecoderImpl::DeleteRenderbuffersHelper(
void GLES2DecoderImpl::DeleteTexturesHelper(
GLsizei n, const GLuint* client_ids) {
- bool supports_seperate_framebuffer_binds =
+ bool supports_separate_framebuffer_binds =
feature_info_->feature_flags().chromium_framebuffer_multisample;
for (GLsizei ii = 0; ii < n; ++ii) {
TextureManager::TextureInfo* texture = GetTextureInfo(client_ids[ii]);
@@ -2571,12 +2571,14 @@ void GLES2DecoderImpl::DeleteTexturesHelper(
texture_units_[ii].Unbind(texture);
}
// Unbind from current framebuffers.
- if (supports_seperate_framebuffer_binds) {
+ if (supports_separate_framebuffer_binds) {
if (bound_read_framebuffer_) {
- bound_read_framebuffer_->UnbindTexture(GL_READ_FRAMEBUFFER, texture);
+ bound_read_framebuffer_->UnbindTexture(
+ GL_READ_FRAMEBUFFER_EXT, texture);
}
if (bound_draw_framebuffer_) {
- bound_draw_framebuffer_->UnbindTexture(GL_DRAW_FRAMEBUFFER, texture);
+ bound_draw_framebuffer_->UnbindTexture(
+ GL_DRAW_FRAMEBUFFER_EXT, texture);
}
} else {
if (bound_draw_framebuffer_) {
@@ -2730,7 +2732,7 @@ bool GLES2DecoderImpl::CheckBoundFramebuffersValid(const char* func_name) {
gfx::Size GLES2DecoderImpl::GetBoundReadFrameBufferSize() {
FramebufferManager::FramebufferInfo* framebuffer =
- GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER);
+ GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER_EXT);
if (framebuffer != NULL) {
const FramebufferManager::FramebufferInfo::Attachment* attachment =
framebuffer->GetAttachment(GL_COLOR_ATTACHMENT0);
@@ -2747,7 +2749,7 @@ gfx::Size GLES2DecoderImpl::GetBoundReadFrameBufferSize() {
GLenum GLES2DecoderImpl::GetBoundReadFrameBufferInternalFormat() {
FramebufferManager::FramebufferInfo* framebuffer =
- GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER);
+ GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER_EXT);
if (framebuffer != NULL) {
return framebuffer->GetColorAttachmentFormat();
} else if (offscreen_target_frame_buffer_.get()) {
@@ -2759,7 +2761,7 @@ GLenum GLES2DecoderImpl::GetBoundReadFrameBufferInternalFormat() {
GLenum GLES2DecoderImpl::GetBoundDrawFrameBufferInternalFormat() {
FramebufferManager::FramebufferInfo* framebuffer =
- GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER);
+ GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER_EXT);
if (framebuffer != NULL) {
return framebuffer->GetColorAttachmentFormat();
} else if (offscreen_target_frame_buffer_.get()) {
@@ -3353,7 +3355,7 @@ bool GLES2DecoderImpl::BoundFramebufferHasColorAttachmentWithAlpha() {
bool GLES2DecoderImpl::BoundFramebufferHasDepthAttachment() {
FramebufferManager::FramebufferInfo* framebuffer =
- GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER);
+ GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER_EXT);
if (framebuffer) {
return framebuffer->HasDepthAttachment();
}
@@ -3365,7 +3367,7 @@ bool GLES2DecoderImpl::BoundFramebufferHasDepthAttachment() {
bool GLES2DecoderImpl::BoundFramebufferHasStencilAttachment() {
FramebufferManager::FramebufferInfo* framebuffer =
- GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER);
+ GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER_EXT);
if (framebuffer) {
return framebuffer->HasStencilAttachment();
}
@@ -3808,7 +3810,7 @@ bool GLES2DecoderImpl::GetHelper(
*num_written = 1;
if (params) {
FramebufferManager::FramebufferInfo* framebuffer =
- GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER);
+ GetFramebufferInfoForTarget(GL_FRAMEBUFFER);
if (framebuffer) {
GLuint client_id = 0;
framebuffer_manager()->GetClientId(
@@ -3819,11 +3821,11 @@ bool GLES2DecoderImpl::GetHelper(
}
}
return true;
- case GL_READ_FRAMEBUFFER_BINDING:
+ case GL_READ_FRAMEBUFFER_BINDING_EXT:
*num_written = 1;
if (params) {
FramebufferManager::FramebufferInfo* framebuffer =
- GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER);
+ GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER_EXT);
if (framebuffer) {
GLuint client_id = 0;
framebuffer_manager()->GetClientId(
« no previous file with comments | « gpu/command_buffer/build_gles2_cmd_buffer.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698