| Index: gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
|
| ===================================================================
|
| --- gpu/command_buffer/service/gles2_cmd_decoder_autogen.h (revision 99750)
|
| +++ gpu/command_buffer/service/gles2_cmd_decoder_autogen.h (working copy)
|
| @@ -29,7 +29,7 @@
|
| uint32 immediate_data_size, const gles2::BindBuffer& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLuint buffer = c.buffer;
|
| - if (!validators_->buffer_target.IsValid(target)) {
|
| + if (!validators()->buffer_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glBindBuffer: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -41,7 +41,7 @@
|
| uint32 immediate_data_size, const gles2::BindFramebuffer& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLuint framebuffer = c.framebuffer;
|
| - if (!validators_->frame_buffer_target.IsValid(target)) {
|
| + if (!validators()->frame_buffer_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glBindFramebuffer: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -53,7 +53,7 @@
|
| uint32 immediate_data_size, const gles2::BindRenderbuffer& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLuint renderbuffer = c.renderbuffer;
|
| - if (!validators_->render_buffer_target.IsValid(target)) {
|
| + if (!validators()->render_buffer_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glBindRenderbuffer: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -65,7 +65,7 @@
|
| uint32 immediate_data_size, const gles2::BindTexture& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLuint texture = c.texture;
|
| - if (!validators_->texture_bind_target.IsValid(target)) {
|
| + if (!validators()->texture_bind_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glBindTexture: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -86,7 +86,7 @@
|
| error::Error GLES2DecoderImpl::HandleBlendEquation(
|
| uint32 immediate_data_size, const gles2::BlendEquation& c) {
|
| GLenum mode = static_cast<GLenum>(c.mode);
|
| - if (!validators_->equation.IsValid(mode)) {
|
| + if (!validators()->equation.IsValid(mode)) {
|
| SetGLError(GL_INVALID_ENUM, "glBlendEquation: mode GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -98,12 +98,12 @@
|
| uint32 immediate_data_size, const gles2::BlendEquationSeparate& c) {
|
| GLenum modeRGB = static_cast<GLenum>(c.modeRGB);
|
| GLenum modeAlpha = static_cast<GLenum>(c.modeAlpha);
|
| - if (!validators_->equation.IsValid(modeRGB)) {
|
| + if (!validators()->equation.IsValid(modeRGB)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glBlendEquationSeparate: modeRGB GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->equation.IsValid(modeAlpha)) {
|
| + if (!validators()->equation.IsValid(modeAlpha)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glBlendEquationSeparate: modeAlpha GL_INVALID_ENUM");
|
| return error::kNoError;
|
| @@ -116,11 +116,11 @@
|
| uint32 immediate_data_size, const gles2::BlendFunc& c) {
|
| GLenum sfactor = static_cast<GLenum>(c.sfactor);
|
| GLenum dfactor = static_cast<GLenum>(c.dfactor);
|
| - if (!validators_->src_blend_factor.IsValid(sfactor)) {
|
| + if (!validators()->src_blend_factor.IsValid(sfactor)) {
|
| SetGLError(GL_INVALID_ENUM, "glBlendFunc: sfactor GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->dst_blend_factor.IsValid(dfactor)) {
|
| + if (!validators()->dst_blend_factor.IsValid(dfactor)) {
|
| SetGLError(GL_INVALID_ENUM, "glBlendFunc: dfactor GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -134,20 +134,20 @@
|
| GLenum dstRGB = static_cast<GLenum>(c.dstRGB);
|
| GLenum srcAlpha = static_cast<GLenum>(c.srcAlpha);
|
| GLenum dstAlpha = static_cast<GLenum>(c.dstAlpha);
|
| - if (!validators_->src_blend_factor.IsValid(srcRGB)) {
|
| + if (!validators()->src_blend_factor.IsValid(srcRGB)) {
|
| SetGLError(GL_INVALID_ENUM, "glBlendFuncSeparate: srcRGB GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->dst_blend_factor.IsValid(dstRGB)) {
|
| + if (!validators()->dst_blend_factor.IsValid(dstRGB)) {
|
| SetGLError(GL_INVALID_ENUM, "glBlendFuncSeparate: dstRGB GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->src_blend_factor.IsValid(srcAlpha)) {
|
| + if (!validators()->src_blend_factor.IsValid(srcAlpha)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glBlendFuncSeparate: srcAlpha GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->dst_blend_factor.IsValid(dstAlpha)) {
|
| + if (!validators()->dst_blend_factor.IsValid(dstAlpha)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glBlendFuncSeparate: dstAlpha GL_INVALID_ENUM");
|
| return error::kNoError;
|
| @@ -164,7 +164,7 @@
|
| uint32 data_size = size;
|
| const void* data = GetSharedMemoryAs<const void*>(
|
| c.data_shm_id, c.data_shm_offset, data_size);
|
| - if (!validators_->buffer_target.IsValid(target)) {
|
| + if (!validators()->buffer_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glBufferSubData: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -187,7 +187,7 @@
|
| uint32 data_size = size;
|
| const void* data = GetImmediateDataAs<const void*>(
|
| c, data_size, immediate_data_size);
|
| - if (!validators_->buffer_target.IsValid(target)) {
|
| + if (!validators()->buffer_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glBufferSubData: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -211,7 +211,7 @@
|
| if (!result_dst) {
|
| return error::kOutOfBounds;
|
| }
|
| - if (!validators_->frame_buffer_target.IsValid(target)) {
|
| + if (!validators()->frame_buffer_target.IsValid(target)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glCheckFramebufferStatus: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| @@ -281,7 +281,7 @@
|
| uint32 data_size = imageSize;
|
| const void* data = GetSharedMemoryAs<const void*>(
|
| c.data_shm_id, c.data_shm_offset, data_size);
|
| - if (!validators_->texture_target.IsValid(target)) {
|
| + if (!validators()->texture_target.IsValid(target)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glCompressedTexSubImage2D: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| @@ -294,7 +294,7 @@
|
| SetGLError(GL_INVALID_VALUE, "glCompressedTexSubImage2D: height < 0");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->compressed_texture_format.IsValid(format)) {
|
| + if (!validators()->compressed_texture_format.IsValid(format)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glCompressedTexSubImage2D: format GL_INVALID_ENUM");
|
| return error::kNoError;
|
| @@ -325,7 +325,7 @@
|
| uint32 data_size = imageSize;
|
| const void* data = GetImmediateDataAs<const void*>(
|
| c, data_size, immediate_data_size);
|
| - if (!validators_->texture_target.IsValid(target)) {
|
| + if (!validators()->texture_target.IsValid(target)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glCompressedTexSubImage2D: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| @@ -338,7 +338,7 @@
|
| SetGLError(GL_INVALID_VALUE, "glCompressedTexSubImage2D: height < 0");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->compressed_texture_format.IsValid(format)) {
|
| + if (!validators()->compressed_texture_format.IsValid(format)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glCompressedTexSubImage2D: format GL_INVALID_ENUM");
|
| return error::kNoError;
|
| @@ -365,11 +365,11 @@
|
| GLsizei width = static_cast<GLsizei>(c.width);
|
| GLsizei height = static_cast<GLsizei>(c.height);
|
| GLint border = static_cast<GLint>(c.border);
|
| - if (!validators_->texture_target.IsValid(target)) {
|
| + if (!validators()->texture_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glCopyTexImage2D: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->texture_internal_format.IsValid(internalformat)) {
|
| + if (!validators()->texture_internal_format.IsValid(internalformat)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glCopyTexImage2D: internalformat GL_INVALID_ENUM");
|
| return error::kNoError;
|
| @@ -382,7 +382,7 @@
|
| SetGLError(GL_INVALID_VALUE, "glCopyTexImage2D: height < 0");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->texture_border.IsValid(border)) {
|
| + if (!validators()->texture_border.IsValid(border)) {
|
| SetGLError(GL_INVALID_VALUE, "glCopyTexImage2D: border GL_INVALID_VALUE");
|
| return error::kNoError;
|
| }
|
| @@ -400,7 +400,7 @@
|
| GLint y = static_cast<GLint>(c.y);
|
| GLsizei width = static_cast<GLsizei>(c.width);
|
| GLsizei height = static_cast<GLsizei>(c.height);
|
| - if (!validators_->texture_target.IsValid(target)) {
|
| + if (!validators()->texture_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glCopyTexSubImage2D: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -428,7 +428,7 @@
|
| error::Error GLES2DecoderImpl::HandleCreateShader(
|
| uint32 immediate_data_size, const gles2::CreateShader& c) {
|
| GLenum type = static_cast<GLenum>(c.type);
|
| - if (!validators_->shader_type.IsValid(type)) {
|
| + if (!validators()->shader_type.IsValid(type)) {
|
| SetGLError(GL_INVALID_ENUM, "glCreateShader: type GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -442,7 +442,7 @@
|
| error::Error GLES2DecoderImpl::HandleCullFace(
|
| uint32 immediate_data_size, const gles2::CullFace& c) {
|
| GLenum mode = static_cast<GLenum>(c.mode);
|
| - if (!validators_->face_type.IsValid(mode)) {
|
| + if (!validators()->face_type.IsValid(mode)) {
|
| SetGLError(GL_INVALID_ENUM, "glCullFace: mode GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -581,7 +581,7 @@
|
| error::Error GLES2DecoderImpl::HandleDepthFunc(
|
| uint32 immediate_data_size, const gles2::DepthFunc& c) {
|
| GLenum func = static_cast<GLenum>(c.func);
|
| - if (!validators_->cmp_function.IsValid(func)) {
|
| + if (!validators()->cmp_function.IsValid(func)) {
|
| SetGLError(GL_INVALID_ENUM, "glDepthFunc: func GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -615,7 +615,7 @@
|
| error::Error GLES2DecoderImpl::HandleDisable(
|
| uint32 immediate_data_size, const gles2::Disable& c) {
|
| GLenum cap = static_cast<GLenum>(c.cap);
|
| - if (!validators_->capability.IsValid(cap)) {
|
| + if (!validators()->capability.IsValid(cap)) {
|
| SetGLError(GL_INVALID_ENUM, "glDisable: cap GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -633,7 +633,7 @@
|
| error::Error GLES2DecoderImpl::HandleEnable(
|
| uint32 immediate_data_size, const gles2::Enable& c) {
|
| GLenum cap = static_cast<GLenum>(c.cap);
|
| - if (!validators_->capability.IsValid(cap)) {
|
| + if (!validators()->capability.IsValid(cap)) {
|
| SetGLError(GL_INVALID_ENUM, "glEnable: cap GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -666,18 +666,18 @@
|
| GLenum attachment = static_cast<GLenum>(c.attachment);
|
| GLenum renderbuffertarget = static_cast<GLenum>(c.renderbuffertarget);
|
| GLuint renderbuffer = c.renderbuffer;
|
| - if (!validators_->frame_buffer_target.IsValid(target)) {
|
| + if (!validators()->frame_buffer_target.IsValid(target)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glFramebufferRenderbuffer: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->attachment.IsValid(attachment)) {
|
| + if (!validators()->attachment.IsValid(attachment)) {
|
| SetGLError(
|
| GL_INVALID_ENUM,
|
| "glFramebufferRenderbuffer: attachment GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->render_buffer_target.IsValid(renderbuffertarget)) {
|
| + if (!validators()->render_buffer_target.IsValid(renderbuffertarget)) {
|
| SetGLError(
|
| GL_INVALID_ENUM,
|
| "glFramebufferRenderbuffer: renderbuffertarget GL_INVALID_ENUM");
|
| @@ -695,22 +695,22 @@
|
| GLenum textarget = static_cast<GLenum>(c.textarget);
|
| GLuint texture = c.texture;
|
| GLint level = static_cast<GLint>(c.level);
|
| - if (!validators_->frame_buffer_target.IsValid(target)) {
|
| + if (!validators()->frame_buffer_target.IsValid(target)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glFramebufferTexture2D: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->attachment.IsValid(attachment)) {
|
| + if (!validators()->attachment.IsValid(attachment)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glFramebufferTexture2D: attachment GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->texture_target.IsValid(textarget)) {
|
| + if (!validators()->texture_target.IsValid(textarget)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glFramebufferTexture2D: textarget GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->zero_only.IsValid(level)) {
|
| + if (!validators()->zero_only.IsValid(level)) {
|
| SetGLError(
|
| GL_INVALID_VALUE, "glFramebufferTexture2D: level GL_INVALID_VALUE");
|
| return error::kNoError;
|
| @@ -722,7 +722,7 @@
|
| error::Error GLES2DecoderImpl::HandleFrontFace(
|
| uint32 immediate_data_size, const gles2::FrontFace& c) {
|
| GLenum mode = static_cast<GLenum>(c.mode);
|
| - if (!validators_->face_mode.IsValid(mode)) {
|
| + if (!validators()->face_mode.IsValid(mode)) {
|
| SetGLError(GL_INVALID_ENUM, "glFrontFace: mode GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -769,7 +769,7 @@
|
| error::Error GLES2DecoderImpl::HandleGenerateMipmap(
|
| uint32 immediate_data_size, const gles2::GenerateMipmap& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| - if (!validators_->texture_bind_target.IsValid(target)) {
|
| + if (!validators()->texture_bind_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glGenerateMipmap: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -894,7 +894,7 @@
|
| Result* result = GetSharedMemoryAs<Result*>(
|
| c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
|
| GLboolean* params = result ? result->GetData() : NULL;
|
| - if (!validators_->g_l_state.IsValid(pname)) {
|
| + if (!validators()->g_l_state.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glGetBooleanv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -926,12 +926,12 @@
|
| Result* result = GetSharedMemoryAs<Result*>(
|
| c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
|
| GLint* params = result ? result->GetData() : NULL;
|
| - if (!validators_->buffer_target.IsValid(target)) {
|
| + if (!validators()->buffer_target.IsValid(target)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glGetBufferParameteriv: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->buffer_parameter.IsValid(pname)) {
|
| + if (!validators()->buffer_parameter.IsValid(pname)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glGetBufferParameteriv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| @@ -975,7 +975,7 @@
|
| Result* result = GetSharedMemoryAs<Result*>(
|
| c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
|
| GLfloat* params = result ? result->GetData() : NULL;
|
| - if (!validators_->g_l_state.IsValid(pname)) {
|
| + if (!validators()->g_l_state.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glGetFloatv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1009,19 +1009,19 @@
|
| Result* result = GetSharedMemoryAs<Result*>(
|
| c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
|
| GLint* params = result ? result->GetData() : NULL;
|
| - if (!validators_->frame_buffer_target.IsValid(target)) {
|
| + if (!validators()->frame_buffer_target.IsValid(target)) {
|
| SetGLError(
|
| GL_INVALID_ENUM,
|
| "glGetFramebufferAttachmentParameteriv: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->attachment.IsValid(attachment)) {
|
| + if (!validators()->attachment.IsValid(attachment)) {
|
| SetGLError(
|
| GL_INVALID_ENUM,
|
| "glGetFramebufferAttachmentParameteriv: attachment GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->frame_buffer_parameter.IsValid(pname)) {
|
| + if (!validators()->frame_buffer_parameter.IsValid(pname)) {
|
| SetGLError(
|
| GL_INVALID_ENUM,
|
| "glGetFramebufferAttachmentParameteriv: pname GL_INVALID_ENUM");
|
| @@ -1054,7 +1054,7 @@
|
| Result* result = GetSharedMemoryAs<Result*>(
|
| c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
|
| GLint* params = result ? result->GetData() : NULL;
|
| - if (!validators_->g_l_state.IsValid(pname)) {
|
| + if (!validators()->g_l_state.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glGetIntegerv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1086,7 +1086,7 @@
|
| Result* result = GetSharedMemoryAs<Result*>(
|
| c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
|
| GLint* params = result ? result->GetData() : NULL;
|
| - if (!validators_->program_parameter.IsValid(pname)) {
|
| + if (!validators()->program_parameter.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glGetProgramiv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1118,13 +1118,13 @@
|
| Result* result = GetSharedMemoryAs<Result*>(
|
| c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
|
| GLint* params = result ? result->GetData() : NULL;
|
| - if (!validators_->render_buffer_target.IsValid(target)) {
|
| + if (!validators()->render_buffer_target.IsValid(target)) {
|
| SetGLError(
|
| GL_INVALID_ENUM,
|
| "glGetRenderbufferParameteriv: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->render_buffer_parameter.IsValid(pname)) {
|
| + if (!validators()->render_buffer_parameter.IsValid(pname)) {
|
| SetGLError(
|
| GL_INVALID_ENUM,
|
| "glGetRenderbufferParameteriv: pname GL_INVALID_ENUM");
|
| @@ -1158,7 +1158,7 @@
|
| Result* result = GetSharedMemoryAs<Result*>(
|
| c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
|
| GLint* params = result ? result->GetData() : NULL;
|
| - if (!validators_->shader_parameter.IsValid(pname)) {
|
| + if (!validators()->shader_parameter.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glGetShaderiv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1190,11 +1190,11 @@
|
| Result* result = GetSharedMemoryAs<Result*>(
|
| c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
|
| GLfloat* params = result ? result->GetData() : NULL;
|
| - if (!validators_->get_tex_param_target.IsValid(target)) {
|
| + if (!validators()->get_tex_param_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glGetTexParameterfv: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->texture_parameter.IsValid(pname)) {
|
| + if (!validators()->texture_parameter.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glGetTexParameterfv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1226,11 +1226,11 @@
|
| Result* result = GetSharedMemoryAs<Result*>(
|
| c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
|
| GLint* params = result ? result->GetData() : NULL;
|
| - if (!validators_->get_tex_param_target.IsValid(target)) {
|
| + if (!validators()->get_tex_param_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glGetTexParameteriv: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->texture_parameter.IsValid(pname)) {
|
| + if (!validators()->texture_parameter.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glGetTexParameteriv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1262,7 +1262,7 @@
|
| Result* result = GetSharedMemoryAs<Result*>(
|
| c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
|
| GLfloat* params = result ? result->GetData() : NULL;
|
| - if (!validators_->vertex_attribute.IsValid(pname)) {
|
| + if (!validators()->vertex_attribute.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glGetVertexAttribfv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1294,7 +1294,7 @@
|
| Result* result = GetSharedMemoryAs<Result*>(
|
| c.params_shm_id, c.params_shm_offset, Result::ComputeSize(num_values));
|
| GLint* params = result ? result->GetData() : NULL;
|
| - if (!validators_->vertex_attribute.IsValid(pname)) {
|
| + if (!validators()->vertex_attribute.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glGetVertexAttribiv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1320,11 +1320,11 @@
|
| uint32 immediate_data_size, const gles2::Hint& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum mode = static_cast<GLenum>(c.mode);
|
| - if (!validators_->hint_target.IsValid(target)) {
|
| + if (!validators()->hint_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glHint: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->hint_mode.IsValid(mode)) {
|
| + if (!validators()->hint_mode.IsValid(mode)) {
|
| SetGLError(GL_INVALID_ENUM, "glHint: mode GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1354,7 +1354,7 @@
|
| if (!result_dst) {
|
| return error::kOutOfBounds;
|
| }
|
| - if (!validators_->capability.IsValid(cap)) {
|
| + if (!validators()->capability.IsValid(cap)) {
|
| SetGLError(GL_INVALID_ENUM, "glIsEnabled: cap GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1461,12 +1461,12 @@
|
| GLenum internalformat = static_cast<GLenum>(c.internalformat);
|
| GLsizei width = static_cast<GLsizei>(c.width);
|
| GLsizei height = static_cast<GLsizei>(c.height);
|
| - if (!validators_->render_buffer_target.IsValid(target)) {
|
| + if (!validators()->render_buffer_target.IsValid(target)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glRenderbufferStorage: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->render_buffer_format.IsValid(internalformat)) {
|
| + if (!validators()->render_buffer_format.IsValid(internalformat)) {
|
| SetGLError(
|
| GL_INVALID_ENUM,
|
| "glRenderbufferStorage: internalformat GL_INVALID_ENUM");
|
| @@ -1515,7 +1515,7 @@
|
| GLenum func = static_cast<GLenum>(c.func);
|
| GLint ref = static_cast<GLint>(c.ref);
|
| GLuint mask = static_cast<GLuint>(c.mask);
|
| - if (!validators_->cmp_function.IsValid(func)) {
|
| + if (!validators()->cmp_function.IsValid(func)) {
|
| SetGLError(GL_INVALID_ENUM, "glStencilFunc: func GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1529,11 +1529,11 @@
|
| GLenum func = static_cast<GLenum>(c.func);
|
| GLint ref = static_cast<GLint>(c.ref);
|
| GLuint mask = static_cast<GLuint>(c.mask);
|
| - if (!validators_->face_type.IsValid(face)) {
|
| + if (!validators()->face_type.IsValid(face)) {
|
| SetGLError(GL_INVALID_ENUM, "glStencilFuncSeparate: face GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->cmp_function.IsValid(func)) {
|
| + if (!validators()->cmp_function.IsValid(func)) {
|
| SetGLError(GL_INVALID_ENUM, "glStencilFuncSeparate: func GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1552,7 +1552,7 @@
|
| uint32 immediate_data_size, const gles2::StencilMaskSeparate& c) {
|
| GLenum face = static_cast<GLenum>(c.face);
|
| GLuint mask = static_cast<GLuint>(c.mask);
|
| - if (!validators_->face_type.IsValid(face)) {
|
| + if (!validators()->face_type.IsValid(face)) {
|
| SetGLError(GL_INVALID_ENUM, "glStencilMaskSeparate: face GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1565,15 +1565,15 @@
|
| GLenum fail = static_cast<GLenum>(c.fail);
|
| GLenum zfail = static_cast<GLenum>(c.zfail);
|
| GLenum zpass = static_cast<GLenum>(c.zpass);
|
| - if (!validators_->stencil_op.IsValid(fail)) {
|
| + if (!validators()->stencil_op.IsValid(fail)) {
|
| SetGLError(GL_INVALID_ENUM, "glStencilOp: fail GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->stencil_op.IsValid(zfail)) {
|
| + if (!validators()->stencil_op.IsValid(zfail)) {
|
| SetGLError(GL_INVALID_ENUM, "glStencilOp: zfail GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->stencil_op.IsValid(zpass)) {
|
| + if (!validators()->stencil_op.IsValid(zpass)) {
|
| SetGLError(GL_INVALID_ENUM, "glStencilOp: zpass GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1587,19 +1587,19 @@
|
| GLenum fail = static_cast<GLenum>(c.fail);
|
| GLenum zfail = static_cast<GLenum>(c.zfail);
|
| GLenum zpass = static_cast<GLenum>(c.zpass);
|
| - if (!validators_->face_type.IsValid(face)) {
|
| + if (!validators()->face_type.IsValid(face)) {
|
| SetGLError(GL_INVALID_ENUM, "glStencilOpSeparate: face GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->stencil_op.IsValid(fail)) {
|
| + if (!validators()->stencil_op.IsValid(fail)) {
|
| SetGLError(GL_INVALID_ENUM, "glStencilOpSeparate: fail GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->stencil_op.IsValid(zfail)) {
|
| + if (!validators()->stencil_op.IsValid(zfail)) {
|
| SetGLError(GL_INVALID_ENUM, "glStencilOpSeparate: zfail GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->stencil_op.IsValid(zpass)) {
|
| + if (!validators()->stencil_op.IsValid(zpass)) {
|
| SetGLError(GL_INVALID_ENUM, "glStencilOpSeparate: zpass GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1612,11 +1612,11 @@
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| GLfloat param = static_cast<GLfloat>(c.param);
|
| - if (!validators_->texture_bind_target.IsValid(target)) {
|
| + if (!validators()->texture_bind_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glTexParameterf: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->texture_parameter.IsValid(pname)) {
|
| + if (!validators()->texture_parameter.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glTexParameterf: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1634,11 +1634,11 @@
|
| }
|
| const GLfloat* params = GetSharedMemoryAs<const GLfloat*>(
|
| c.params_shm_id, c.params_shm_offset, data_size);
|
| - if (!validators_->texture_bind_target.IsValid(target)) {
|
| + if (!validators()->texture_bind_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glTexParameterfv: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->texture_parameter.IsValid(pname)) {
|
| + if (!validators()->texture_parameter.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glTexParameterfv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1662,11 +1662,11 @@
|
| }
|
| const GLfloat* params = GetImmediateDataAs<const GLfloat*>(
|
| c, data_size, immediate_data_size);
|
| - if (!validators_->texture_bind_target.IsValid(target)) {
|
| + if (!validators()->texture_bind_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glTexParameterfv: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->texture_parameter.IsValid(pname)) {
|
| + if (!validators()->texture_parameter.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glTexParameterfv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1682,11 +1682,11 @@
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| GLint param = static_cast<GLint>(c.param);
|
| - if (!validators_->texture_bind_target.IsValid(target)) {
|
| + if (!validators()->texture_bind_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glTexParameteri: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->texture_parameter.IsValid(pname)) {
|
| + if (!validators()->texture_parameter.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glTexParameteri: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1704,11 +1704,11 @@
|
| }
|
| const GLint* params = GetSharedMemoryAs<const GLint*>(
|
| c.params_shm_id, c.params_shm_offset, data_size);
|
| - if (!validators_->texture_bind_target.IsValid(target)) {
|
| + if (!validators()->texture_bind_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glTexParameteriv: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->texture_parameter.IsValid(pname)) {
|
| + if (!validators()->texture_parameter.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glTexParameteriv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -1732,11 +1732,11 @@
|
| }
|
| const GLint* params = GetImmediateDataAs<const GLint*>(
|
| c, data_size, immediate_data_size);
|
| - if (!validators_->texture_bind_target.IsValid(target)) {
|
| + if (!validators()->texture_bind_target.IsValid(target)) {
|
| SetGLError(GL_INVALID_ENUM, "glTexParameteriv: target GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->texture_parameter.IsValid(pname)) {
|
| + if (!validators()->texture_parameter.IsValid(pname)) {
|
| SetGLError(GL_INVALID_ENUM, "glTexParameteriv: pname GL_INVALID_ENUM");
|
| return error::kNoError;
|
| }
|
| @@ -2134,7 +2134,7 @@
|
| }
|
| const GLfloat* value = GetSharedMemoryAs<const GLfloat*>(
|
| c.value_shm_id, c.value_shm_offset, data_size);
|
| - if (!validators_->false_only.IsValid(transpose)) {
|
| + if (!validators()->false_only.IsValid(transpose)) {
|
| SetGLError(
|
| GL_INVALID_VALUE, "glUniformMatrix2fv: transpose GL_INVALID_VALUE");
|
| return error::kNoError;
|
| @@ -2160,7 +2160,7 @@
|
| }
|
| const GLfloat* value = GetImmediateDataAs<const GLfloat*>(
|
| c, data_size, immediate_data_size);
|
| - if (!validators_->false_only.IsValid(transpose)) {
|
| + if (!validators()->false_only.IsValid(transpose)) {
|
| SetGLError(
|
| GL_INVALID_VALUE, "glUniformMatrix2fv: transpose GL_INVALID_VALUE");
|
| return error::kNoError;
|
| @@ -2183,7 +2183,7 @@
|
| }
|
| const GLfloat* value = GetSharedMemoryAs<const GLfloat*>(
|
| c.value_shm_id, c.value_shm_offset, data_size);
|
| - if (!validators_->false_only.IsValid(transpose)) {
|
| + if (!validators()->false_only.IsValid(transpose)) {
|
| SetGLError(
|
| GL_INVALID_VALUE, "glUniformMatrix3fv: transpose GL_INVALID_VALUE");
|
| return error::kNoError;
|
| @@ -2209,7 +2209,7 @@
|
| }
|
| const GLfloat* value = GetImmediateDataAs<const GLfloat*>(
|
| c, data_size, immediate_data_size);
|
| - if (!validators_->false_only.IsValid(transpose)) {
|
| + if (!validators()->false_only.IsValid(transpose)) {
|
| SetGLError(
|
| GL_INVALID_VALUE, "glUniformMatrix3fv: transpose GL_INVALID_VALUE");
|
| return error::kNoError;
|
| @@ -2232,7 +2232,7 @@
|
| }
|
| const GLfloat* value = GetSharedMemoryAs<const GLfloat*>(
|
| c.value_shm_id, c.value_shm_offset, data_size);
|
| - if (!validators_->false_only.IsValid(transpose)) {
|
| + if (!validators()->false_only.IsValid(transpose)) {
|
| SetGLError(
|
| GL_INVALID_VALUE, "glUniformMatrix4fv: transpose GL_INVALID_VALUE");
|
| return error::kNoError;
|
| @@ -2258,7 +2258,7 @@
|
| }
|
| const GLfloat* value = GetImmediateDataAs<const GLfloat*>(
|
| c, data_size, immediate_data_size);
|
| - if (!validators_->false_only.IsValid(transpose)) {
|
| + if (!validators()->false_only.IsValid(transpose)) {
|
| SetGLError(
|
| GL_INVALID_VALUE, "glUniformMatrix4fv: transpose GL_INVALID_VALUE");
|
| return error::kNoError;
|
| @@ -2492,7 +2492,7 @@
|
| GLint dstY1 = static_cast<GLint>(c.dstY1);
|
| GLbitfield mask = static_cast<GLbitfield>(c.mask);
|
| GLenum filter = static_cast<GLenum>(c.filter);
|
| - if (!validators_->blit_filter.IsValid(filter)) {
|
| + if (!validators()->blit_filter.IsValid(filter)) {
|
| SetGLError(
|
| GL_INVALID_ENUM, "glBlitFramebufferEXT: filter GL_INVALID_ENUM");
|
| return error::kNoError;
|
| @@ -2510,7 +2510,7 @@
|
| GLenum internalformat = static_cast<GLenum>(c.internalformat);
|
| GLsizei width = static_cast<GLsizei>(c.width);
|
| GLsizei height = static_cast<GLsizei>(c.height);
|
| - if (!validators_->render_buffer_target.IsValid(target)) {
|
| + if (!validators()->render_buffer_target.IsValid(target)) {
|
| SetGLError(
|
| GL_INVALID_ENUM,
|
| "glRenderbufferStorageMultisampleEXT: target GL_INVALID_ENUM");
|
| @@ -2521,7 +2521,7 @@
|
| GL_INVALID_VALUE, "glRenderbufferStorageMultisampleEXT: samples < 0");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->render_buffer_format.IsValid(internalformat)) {
|
| + if (!validators()->render_buffer_format.IsValid(internalformat)) {
|
| SetGLError(
|
| GL_INVALID_ENUM,
|
| "glRenderbufferStorageMultisampleEXT: internalformat GL_INVALID_ENUM");
|
| @@ -2558,7 +2558,7 @@
|
| SetGLError(GL_INVALID_VALUE, "glGetMaxValueInBufferCHROMIUM: count < 0");
|
| return error::kNoError;
|
| }
|
| - if (!validators_->get_max_index_type.IsValid(type)) {
|
| + if (!validators()->get_max_index_type.IsValid(type)) {
|
| SetGLError(
|
| GL_INVALID_ENUM,
|
| "glGetMaxValueInBufferCHROMIUM: type GL_INVALID_ENUM");
|
|
|