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 9cfe4668da5cf5140885bcfa5f4a2a0f2763e0a6..0496cfa1979a700f4fbc7b02d2457d0eb300ad5a 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc |
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc |
@@ -3637,8 +3637,9 @@ void GLES2DecoderImpl::DoBindBuffer(GLenum target, GLuint client_id) { |
buffer = GetBuffer(client_id); |
if (!buffer) { |
if (!group_->bind_generates_resource()) { |
- LOG(ERROR) << "glBindBuffer: id not generated by glGenBuffers"; |
- current_decoder_error_ = error::kGenericError; |
+ LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, |
+ "glBindBuffer", |
+ "id not generated by glGenBuffers"); |
return; |
} |
@@ -3812,9 +3813,9 @@ void GLES2DecoderImpl::DoBindFramebuffer(GLenum target, GLuint client_id) { |
framebuffer = GetFramebuffer(client_id); |
if (!framebuffer) { |
if (!group_->bind_generates_resource()) { |
- LOG(ERROR) |
- << "glBindFramebuffer: id not generated by glGenFramebuffers"; |
- current_decoder_error_ = error::kGenericError; |
+ LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, |
+ "glBindFramebuffer", |
+ "id not generated by glGenFramebuffers"); |
return; |
no sievers
2014/02/12 01:09:04
nit: indent
vmiura
2014/02/12 02:03:52
Done.
|
} |
@@ -3860,9 +3861,9 @@ void GLES2DecoderImpl::DoBindRenderbuffer(GLenum target, GLuint client_id) { |
renderbuffer = GetRenderbuffer(client_id); |
if (!renderbuffer) { |
if (!group_->bind_generates_resource()) { |
- LOG(ERROR) |
- << "glBindRenderbuffer: id not generated by glGenRenderbuffers"; |
- current_decoder_error_ = error::kGenericError; |
+ LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, |
+ "glBindRenderbuffer", |
+ "id not generated by glGenRenderbuffers"); |
return; |
} |
@@ -3890,9 +3891,10 @@ void GLES2DecoderImpl::DoBindTexture(GLenum target, GLuint client_id) { |
texture_ref = GetTexture(client_id); |
if (!texture_ref) { |
if (!group_->bind_generates_resource()) { |
- LOG(ERROR) << "glBindTexture: id not generated by glGenTextures"; |
- current_decoder_error_ = error::kGenericError; |
- return; |
+ LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, |
+ "glBindTexture", |
+ "id not generated by glGenTextures"); |
+ return; |
} |
// It's a new id so make a texture texture for it. |