| Index: gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
|
| index efc2b9b58bc6d523ae0c2c3c3d941af4245146e3..6220afcbc030fd6bbd9dad762272af8ce847965e 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
|
| @@ -13,7 +13,7 @@
|
| #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_AUTOGEN_H_
|
|
|
| error::Error GLES2DecoderImpl::HandleActiveTexture(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::ActiveTexture& c) {
|
| GLenum texture = static_cast<GLenum>(c.texture);
|
| DoActiveTexture(texture);
|
| @@ -21,7 +21,7 @@ error::Error GLES2DecoderImpl::HandleActiveTexture(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleAttachShader(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::AttachShader& c) {
|
| GLuint program = c.program;
|
| GLuint shader = c.shader;
|
| @@ -30,7 +30,7 @@ error::Error GLES2DecoderImpl::HandleAttachShader(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBindBuffer(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BindBuffer& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLuint buffer = c.buffer;
|
| @@ -43,7 +43,7 @@ error::Error GLES2DecoderImpl::HandleBindBuffer(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBindFramebuffer(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BindFramebuffer& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLuint framebuffer = c.framebuffer;
|
| @@ -56,7 +56,7 @@ error::Error GLES2DecoderImpl::HandleBindFramebuffer(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBindRenderbuffer(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BindRenderbuffer& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLuint renderbuffer = c.renderbuffer;
|
| @@ -69,7 +69,7 @@ error::Error GLES2DecoderImpl::HandleBindRenderbuffer(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBindTexture(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BindTexture& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLuint texture = c.texture;
|
| @@ -82,7 +82,7 @@ error::Error GLES2DecoderImpl::HandleBindTexture(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBlendColor(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BlendColor& c) {
|
| GLclampf red = static_cast<GLclampf>(c.red);
|
| GLclampf green = static_cast<GLclampf>(c.green);
|
| @@ -100,7 +100,7 @@ error::Error GLES2DecoderImpl::HandleBlendColor(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBlendEquation(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BlendEquation& c) {
|
| GLenum mode = static_cast<GLenum>(c.mode);
|
| if (!validators_->equation.IsValid(mode)) {
|
| @@ -117,7 +117,7 @@ error::Error GLES2DecoderImpl::HandleBlendEquation(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBlendEquationSeparate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BlendEquationSeparate& c) {
|
| GLenum modeRGB = static_cast<GLenum>(c.modeRGB);
|
| GLenum modeAlpha = static_cast<GLenum>(c.modeAlpha);
|
| @@ -141,7 +141,7 @@ error::Error GLES2DecoderImpl::HandleBlendEquationSeparate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBlendFunc(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BlendFunc& c) {
|
| GLenum sfactor = static_cast<GLenum>(c.sfactor);
|
| GLenum dfactor = static_cast<GLenum>(c.dfactor);
|
| @@ -166,7 +166,7 @@ error::Error GLES2DecoderImpl::HandleBlendFunc(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBlendFuncSeparate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BlendFuncSeparate& c) {
|
| GLenum srcRGB = static_cast<GLenum>(c.srcRGB);
|
| GLenum dstRGB = static_cast<GLenum>(c.dstRGB);
|
| @@ -203,12 +203,12 @@ error::Error GLES2DecoderImpl::HandleBlendFuncSeparate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBufferSubData(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BufferSubData& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLintptr offset = static_cast<GLintptr>(c.offset);
|
| GLsizeiptr size = static_cast<GLsizeiptr>(c.size);
|
| - uint32 data_size = size;
|
| + uint32_t 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)) {
|
| @@ -227,7 +227,7 @@ error::Error GLES2DecoderImpl::HandleBufferSubData(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleCheckFramebufferStatus(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::CheckFramebufferStatus& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| typedef cmds::CheckFramebufferStatus::Result Result;
|
| @@ -245,7 +245,7 @@ error::Error GLES2DecoderImpl::HandleCheckFramebufferStatus(
|
| return error::kNoError;
|
| }
|
|
|
| -error::Error GLES2DecoderImpl::HandleClear(uint32 immediate_data_size,
|
| +error::Error GLES2DecoderImpl::HandleClear(uint32_t immediate_data_size,
|
| const gles2::cmds::Clear& c) {
|
| error::Error error;
|
| error = WillAccessBoundFramebufferForDraw();
|
| @@ -257,7 +257,7 @@ error::Error GLES2DecoderImpl::HandleClear(uint32 immediate_data_size,
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleClearColor(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::ClearColor& c) {
|
| GLclampf red = static_cast<GLclampf>(c.red);
|
| GLclampf green = static_cast<GLclampf>(c.green);
|
| @@ -275,7 +275,7 @@ error::Error GLES2DecoderImpl::HandleClearColor(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleClearDepthf(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::ClearDepthf& c) {
|
| GLclampf depth = static_cast<GLclampf>(c.depth);
|
| if (state_.depth_clear != depth) {
|
| @@ -286,7 +286,7 @@ error::Error GLES2DecoderImpl::HandleClearDepthf(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleClearStencil(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::ClearStencil& c) {
|
| GLint s = static_cast<GLint>(c.s);
|
| if (state_.stencil_clear != s) {
|
| @@ -297,7 +297,7 @@ error::Error GLES2DecoderImpl::HandleClearStencil(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleColorMask(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::ColorMask& c) {
|
| GLboolean red = static_cast<GLboolean>(c.red);
|
| GLboolean green = static_cast<GLboolean>(c.green);
|
| @@ -315,7 +315,7 @@ error::Error GLES2DecoderImpl::HandleColorMask(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleCompileShader(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::CompileShader& c) {
|
| GLuint shader = c.shader;
|
| DoCompileShader(shader);
|
| @@ -323,7 +323,7 @@ error::Error GLES2DecoderImpl::HandleCompileShader(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleCompressedTexSubImage2D(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::CompressedTexSubImage2D& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLint level = static_cast<GLint>(c.level);
|
| @@ -333,7 +333,7 @@ error::Error GLES2DecoderImpl::HandleCompressedTexSubImage2D(
|
| GLsizei height = static_cast<GLsizei>(c.height);
|
| GLenum format = static_cast<GLenum>(c.format);
|
| GLsizei imageSize = static_cast<GLsizei>(c.imageSize);
|
| - uint32 data_size = imageSize;
|
| + uint32_t 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)) {
|
| @@ -370,7 +370,7 @@ error::Error GLES2DecoderImpl::HandleCompressedTexSubImage2D(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleCopyTexImage2D(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::CopyTexImage2D& c) {
|
| error::Error error;
|
| error = WillAccessBoundFramebufferForRead();
|
| @@ -411,7 +411,7 @@ error::Error GLES2DecoderImpl::HandleCopyTexImage2D(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleCopyTexSubImage2D(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::CopyTexSubImage2D& c) {
|
| error::Error error;
|
| error = WillAccessBoundFramebufferForRead();
|
| @@ -442,9 +442,9 @@ error::Error GLES2DecoderImpl::HandleCopyTexSubImage2D(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleCreateProgram(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::CreateProgram& c) {
|
| - uint32 client_id = c.client_id;
|
| + uint32_t client_id = c.client_id;
|
| if (!CreateProgramHelper(client_id)) {
|
| return error::kInvalidArguments;
|
| }
|
| @@ -452,21 +452,21 @@ error::Error GLES2DecoderImpl::HandleCreateProgram(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleCreateShader(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::CreateShader& c) {
|
| GLenum type = static_cast<GLenum>(c.type);
|
| if (!validators_->shader_type.IsValid(type)) {
|
| LOCAL_SET_GL_ERROR_INVALID_ENUM("glCreateShader", type, "type");
|
| return error::kNoError;
|
| }
|
| - uint32 client_id = c.client_id;
|
| + uint32_t client_id = c.client_id;
|
| if (!CreateShaderHelper(type, client_id)) {
|
| return error::kInvalidArguments;
|
| }
|
| return error::kNoError;
|
| }
|
|
|
| -error::Error GLES2DecoderImpl::HandleCullFace(uint32 immediate_data_size,
|
| +error::Error GLES2DecoderImpl::HandleCullFace(uint32_t immediate_data_size,
|
| const gles2::cmds::CullFace& c) {
|
| GLenum mode = static_cast<GLenum>(c.mode);
|
| if (!validators_->face_type.IsValid(mode)) {
|
| @@ -481,10 +481,10 @@ error::Error GLES2DecoderImpl::HandleCullFace(uint32 immediate_data_size,
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDeleteBuffers(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DeleteBuffers& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -498,10 +498,10 @@ error::Error GLES2DecoderImpl::HandleDeleteBuffers(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDeleteBuffersImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DeleteBuffersImmediate& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -515,10 +515,10 @@ error::Error GLES2DecoderImpl::HandleDeleteBuffersImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDeleteFramebuffers(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DeleteFramebuffers& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -532,10 +532,10 @@ error::Error GLES2DecoderImpl::HandleDeleteFramebuffers(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDeleteFramebuffersImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DeleteFramebuffersImmediate& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -549,10 +549,10 @@ error::Error GLES2DecoderImpl::HandleDeleteFramebuffersImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDeleteRenderbuffers(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DeleteRenderbuffers& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -566,10 +566,10 @@ error::Error GLES2DecoderImpl::HandleDeleteRenderbuffers(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDeleteRenderbuffersImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DeleteRenderbuffersImmediate& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -583,10 +583,10 @@ error::Error GLES2DecoderImpl::HandleDeleteRenderbuffersImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDeleteTextures(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DeleteTextures& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -600,10 +600,10 @@ error::Error GLES2DecoderImpl::HandleDeleteTextures(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDeleteTexturesImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DeleteTexturesImmediate& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -617,7 +617,7 @@ error::Error GLES2DecoderImpl::HandleDeleteTexturesImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDepthFunc(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DepthFunc& c) {
|
| GLenum func = static_cast<GLenum>(c.func);
|
| if (!validators_->cmp_function.IsValid(func)) {
|
| @@ -632,7 +632,7 @@ error::Error GLES2DecoderImpl::HandleDepthFunc(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDepthMask(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DepthMask& c) {
|
| GLboolean flag = static_cast<GLboolean>(c.flag);
|
| if (state_.depth_mask != flag) {
|
| @@ -643,7 +643,7 @@ error::Error GLES2DecoderImpl::HandleDepthMask(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDepthRangef(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DepthRangef& c) {
|
| GLclampf zNear = static_cast<GLclampf>(c.zNear);
|
| GLclampf zFar = static_cast<GLclampf>(c.zFar);
|
| @@ -652,7 +652,7 @@ error::Error GLES2DecoderImpl::HandleDepthRangef(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDetachShader(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DetachShader& c) {
|
| GLuint program = c.program;
|
| GLuint shader = c.shader;
|
| @@ -660,7 +660,7 @@ error::Error GLES2DecoderImpl::HandleDetachShader(
|
| return error::kNoError;
|
| }
|
|
|
| -error::Error GLES2DecoderImpl::HandleDisable(uint32 immediate_data_size,
|
| +error::Error GLES2DecoderImpl::HandleDisable(uint32_t immediate_data_size,
|
| const gles2::cmds::Disable& c) {
|
| GLenum cap = static_cast<GLenum>(c.cap);
|
| if (!validators_->capability.IsValid(cap)) {
|
| @@ -672,14 +672,14 @@ error::Error GLES2DecoderImpl::HandleDisable(uint32 immediate_data_size,
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDisableVertexAttribArray(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DisableVertexAttribArray& c) {
|
| GLuint index = static_cast<GLuint>(c.index);
|
| DoDisableVertexAttribArray(index);
|
| return error::kNoError;
|
| }
|
|
|
| -error::Error GLES2DecoderImpl::HandleEnable(uint32 immediate_data_size,
|
| +error::Error GLES2DecoderImpl::HandleEnable(uint32_t immediate_data_size,
|
| const gles2::cmds::Enable& c) {
|
| GLenum cap = static_cast<GLenum>(c.cap);
|
| if (!validators_->capability.IsValid(cap)) {
|
| @@ -691,14 +691,14 @@ error::Error GLES2DecoderImpl::HandleEnable(uint32 immediate_data_size,
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleEnableVertexAttribArray(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::EnableVertexAttribArray& c) {
|
| GLuint index = static_cast<GLuint>(c.index);
|
| DoEnableVertexAttribArray(index);
|
| return error::kNoError;
|
| }
|
|
|
| -error::Error GLES2DecoderImpl::HandleFinish(uint32 immediate_data_size,
|
| +error::Error GLES2DecoderImpl::HandleFinish(uint32_t immediate_data_size,
|
| const gles2::cmds::Finish& c) {
|
| error::Error error;
|
| error = WillAccessBoundFramebufferForRead();
|
| @@ -708,14 +708,14 @@ error::Error GLES2DecoderImpl::HandleFinish(uint32 immediate_data_size,
|
| return error::kNoError;
|
| }
|
|
|
| -error::Error GLES2DecoderImpl::HandleFlush(uint32 immediate_data_size,
|
| +error::Error GLES2DecoderImpl::HandleFlush(uint32_t immediate_data_size,
|
| const gles2::cmds::Flush& c) {
|
| DoFlush();
|
| return error::kNoError;
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleFramebufferRenderbuffer(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::FramebufferRenderbuffer& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum attachment = static_cast<GLenum>(c.attachment);
|
| @@ -742,7 +742,7 @@ error::Error GLES2DecoderImpl::HandleFramebufferRenderbuffer(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleFramebufferTexture2D(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::FramebufferTexture2D& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum attachment = static_cast<GLenum>(c.attachment);
|
| @@ -773,7 +773,7 @@ error::Error GLES2DecoderImpl::HandleFramebufferTexture2D(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleFrontFace(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::FrontFace& c) {
|
| GLenum mode = static_cast<GLenum>(c.mode);
|
| if (!validators_->face_mode.IsValid(mode)) {
|
| @@ -788,10 +788,10 @@ error::Error GLES2DecoderImpl::HandleFrontFace(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenBuffers(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenBuffers& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -807,10 +807,10 @@ error::Error GLES2DecoderImpl::HandleGenBuffers(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenBuffersImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenBuffersImmediate& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -826,7 +826,7 @@ error::Error GLES2DecoderImpl::HandleGenBuffersImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenerateMipmap(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenerateMipmap& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| if (!validators_->texture_bind_target.IsValid(target)) {
|
| @@ -838,10 +838,10 @@ error::Error GLES2DecoderImpl::HandleGenerateMipmap(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenFramebuffers(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenFramebuffers& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -857,10 +857,10 @@ error::Error GLES2DecoderImpl::HandleGenFramebuffers(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenFramebuffersImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenFramebuffersImmediate& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -876,10 +876,10 @@ error::Error GLES2DecoderImpl::HandleGenFramebuffersImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenRenderbuffers(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenRenderbuffers& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -895,10 +895,10 @@ error::Error GLES2DecoderImpl::HandleGenRenderbuffers(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenRenderbuffersImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenRenderbuffersImmediate& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -914,10 +914,10 @@ error::Error GLES2DecoderImpl::HandleGenRenderbuffersImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenTextures(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenTextures& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -933,10 +933,10 @@ error::Error GLES2DecoderImpl::HandleGenTextures(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenTexturesImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenTexturesImmediate& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -952,7 +952,7 @@ error::Error GLES2DecoderImpl::HandleGenTexturesImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetBooleanv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetBooleanv& c) {
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| typedef cmds::GetBooleanv::Result Result;
|
| @@ -984,7 +984,7 @@ error::Error GLES2DecoderImpl::HandleGetBooleanv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetBufferParameteriv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetBufferParameteriv& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| @@ -1013,7 +1013,7 @@ error::Error GLES2DecoderImpl::HandleGetBufferParameteriv(
|
| result->SetNumResults(num_values);
|
| return error::kNoError;
|
| }
|
| -error::Error GLES2DecoderImpl::HandleGetError(uint32 immediate_data_size,
|
| +error::Error GLES2DecoderImpl::HandleGetError(uint32_t immediate_data_size,
|
| const gles2::cmds::GetError& c) {
|
| typedef cmds::GetError::Result Result;
|
| Result* result_dst = GetSharedMemoryAs<Result*>(
|
| @@ -1026,7 +1026,7 @@ error::Error GLES2DecoderImpl::HandleGetError(uint32 immediate_data_size,
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetFloatv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetFloatv& c) {
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| typedef cmds::GetFloatv::Result Result;
|
| @@ -1058,7 +1058,7 @@ error::Error GLES2DecoderImpl::HandleGetFloatv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetFramebufferAttachmentParameteriv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetFramebufferAttachmentParameteriv& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum attachment = static_cast<GLenum>(c.attachment);
|
| @@ -1103,7 +1103,7 @@ error::Error GLES2DecoderImpl::HandleGetFramebufferAttachmentParameteriv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetIntegerv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetIntegerv& c) {
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| typedef cmds::GetIntegerv::Result Result;
|
| @@ -1135,7 +1135,7 @@ error::Error GLES2DecoderImpl::HandleGetIntegerv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetProgramiv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetProgramiv& c) {
|
| GLuint program = c.program;
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| @@ -1168,7 +1168,7 @@ error::Error GLES2DecoderImpl::HandleGetProgramiv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetRenderbufferParameteriv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetRenderbufferParameteriv& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| @@ -1207,7 +1207,7 @@ error::Error GLES2DecoderImpl::HandleGetRenderbufferParameteriv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetShaderiv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetShaderiv& c) {
|
| GLuint shader = c.shader;
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| @@ -1240,7 +1240,7 @@ error::Error GLES2DecoderImpl::HandleGetShaderiv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetTexParameterfv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetTexParameterfv& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| @@ -1277,7 +1277,7 @@ error::Error GLES2DecoderImpl::HandleGetTexParameterfv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetTexParameteriv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetTexParameteriv& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| @@ -1314,7 +1314,7 @@ error::Error GLES2DecoderImpl::HandleGetTexParameteriv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetVertexAttribfv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetVertexAttribfv& c) {
|
| GLuint index = static_cast<GLuint>(c.index);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| @@ -1347,7 +1347,7 @@ error::Error GLES2DecoderImpl::HandleGetVertexAttribfv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetVertexAttribiv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetVertexAttribiv& c) {
|
| GLuint index = static_cast<GLuint>(c.index);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| @@ -1379,7 +1379,7 @@ error::Error GLES2DecoderImpl::HandleGetVertexAttribiv(
|
| return error::kNoError;
|
| }
|
|
|
| -error::Error GLES2DecoderImpl::HandleHint(uint32 immediate_data_size,
|
| +error::Error GLES2DecoderImpl::HandleHint(uint32_t immediate_data_size,
|
| const gles2::cmds::Hint& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum mode = static_cast<GLenum>(c.mode);
|
| @@ -1410,7 +1410,7 @@ error::Error GLES2DecoderImpl::HandleHint(uint32 immediate_data_size,
|
| return error::kNoError;
|
| }
|
|
|
| -error::Error GLES2DecoderImpl::HandleIsBuffer(uint32 immediate_data_size,
|
| +error::Error GLES2DecoderImpl::HandleIsBuffer(uint32_t immediate_data_size,
|
| const gles2::cmds::IsBuffer& c) {
|
| GLuint buffer = c.buffer;
|
| typedef cmds::IsBuffer::Result Result;
|
| @@ -1424,7 +1424,7 @@ error::Error GLES2DecoderImpl::HandleIsBuffer(uint32 immediate_data_size,
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleIsEnabled(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::IsEnabled& c) {
|
| GLenum cap = static_cast<GLenum>(c.cap);
|
| typedef cmds::IsEnabled::Result Result;
|
| @@ -1442,7 +1442,7 @@ error::Error GLES2DecoderImpl::HandleIsEnabled(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleIsFramebuffer(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::IsFramebuffer& c) {
|
| GLuint framebuffer = c.framebuffer;
|
| typedef cmds::IsFramebuffer::Result Result;
|
| @@ -1456,7 +1456,7 @@ error::Error GLES2DecoderImpl::HandleIsFramebuffer(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleIsProgram(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::IsProgram& c) {
|
| GLuint program = c.program;
|
| typedef cmds::IsProgram::Result Result;
|
| @@ -1470,7 +1470,7 @@ error::Error GLES2DecoderImpl::HandleIsProgram(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleIsRenderbuffer(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::IsRenderbuffer& c) {
|
| GLuint renderbuffer = c.renderbuffer;
|
| typedef cmds::IsRenderbuffer::Result Result;
|
| @@ -1483,7 +1483,7 @@ error::Error GLES2DecoderImpl::HandleIsRenderbuffer(
|
| return error::kNoError;
|
| }
|
|
|
| -error::Error GLES2DecoderImpl::HandleIsShader(uint32 immediate_data_size,
|
| +error::Error GLES2DecoderImpl::HandleIsShader(uint32_t immediate_data_size,
|
| const gles2::cmds::IsShader& c) {
|
| GLuint shader = c.shader;
|
| typedef cmds::IsShader::Result Result;
|
| @@ -1497,7 +1497,7 @@ error::Error GLES2DecoderImpl::HandleIsShader(uint32 immediate_data_size,
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleIsTexture(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::IsTexture& c) {
|
| GLuint texture = c.texture;
|
| typedef cmds::IsTexture::Result Result;
|
| @@ -1511,7 +1511,7 @@ error::Error GLES2DecoderImpl::HandleIsTexture(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleLineWidth(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::LineWidth& c) {
|
| GLfloat width = static_cast<GLfloat>(c.width);
|
| if (width <= 0.0f) {
|
| @@ -1526,7 +1526,7 @@ error::Error GLES2DecoderImpl::HandleLineWidth(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleLinkProgram(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::LinkProgram& c) {
|
| GLuint program = c.program;
|
| DoLinkProgram(program);
|
| @@ -1534,7 +1534,7 @@ error::Error GLES2DecoderImpl::HandleLinkProgram(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandlePolygonOffset(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::PolygonOffset& c) {
|
| GLfloat factor = static_cast<GLfloat>(c.factor);
|
| GLfloat units = static_cast<GLfloat>(c.units);
|
| @@ -1548,14 +1548,14 @@ error::Error GLES2DecoderImpl::HandlePolygonOffset(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleReleaseShaderCompiler(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::ReleaseShaderCompiler& c) {
|
| DoReleaseShaderCompiler();
|
| return error::kNoError;
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleRenderbufferStorage(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::RenderbufferStorage& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum internalformat = static_cast<GLenum>(c.internalformat);
|
| @@ -1583,7 +1583,7 @@ error::Error GLES2DecoderImpl::HandleRenderbufferStorage(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleSampleCoverage(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::SampleCoverage& c) {
|
| GLclampf value = static_cast<GLclampf>(c.value);
|
| GLboolean invert = static_cast<GLboolean>(c.invert);
|
| @@ -1591,7 +1591,7 @@ error::Error GLES2DecoderImpl::HandleSampleCoverage(
|
| return error::kNoError;
|
| }
|
|
|
| -error::Error GLES2DecoderImpl::HandleScissor(uint32 immediate_data_size,
|
| +error::Error GLES2DecoderImpl::HandleScissor(uint32_t immediate_data_size,
|
| const gles2::cmds::Scissor& c) {
|
| GLint x = static_cast<GLint>(c.x);
|
| GLint y = static_cast<GLint>(c.y);
|
| @@ -1617,7 +1617,7 @@ error::Error GLES2DecoderImpl::HandleScissor(uint32 immediate_data_size,
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleStencilFunc(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::StencilFunc& c) {
|
| GLenum func = static_cast<GLenum>(c.func);
|
| GLint ref = static_cast<GLint>(c.ref);
|
| @@ -1641,7 +1641,7 @@ error::Error GLES2DecoderImpl::HandleStencilFunc(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleStencilFuncSeparate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::StencilFuncSeparate& c) {
|
| GLenum face = static_cast<GLenum>(c.face);
|
| GLenum func = static_cast<GLenum>(c.func);
|
| @@ -1683,7 +1683,7 @@ error::Error GLES2DecoderImpl::HandleStencilFuncSeparate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleStencilMask(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::StencilMask& c) {
|
| GLuint mask = static_cast<GLuint>(c.mask);
|
| if (state_.stencil_front_writemask != mask ||
|
| @@ -1696,7 +1696,7 @@ error::Error GLES2DecoderImpl::HandleStencilMask(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleStencilMaskSeparate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::StencilMaskSeparate& c) {
|
| GLenum face = static_cast<GLenum>(c.face);
|
| GLuint mask = static_cast<GLuint>(c.mask);
|
| @@ -1724,7 +1724,7 @@ error::Error GLES2DecoderImpl::HandleStencilMaskSeparate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleStencilOp(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::StencilOp& c) {
|
| GLenum fail = static_cast<GLenum>(c.fail);
|
| GLenum zfail = static_cast<GLenum>(c.zfail);
|
| @@ -1759,7 +1759,7 @@ error::Error GLES2DecoderImpl::HandleStencilOp(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleStencilOpSeparate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::StencilOpSeparate& c) {
|
| GLenum face = static_cast<GLenum>(c.face);
|
| GLenum fail = static_cast<GLenum>(c.fail);
|
| @@ -1809,7 +1809,7 @@ error::Error GLES2DecoderImpl::HandleStencilOpSeparate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleTexParameterf(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::TexParameterf& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| @@ -1827,11 +1827,11 @@ error::Error GLES2DecoderImpl::HandleTexParameterf(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleTexParameterfv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::TexParameterfv& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLfloat), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -1853,11 +1853,11 @@ error::Error GLES2DecoderImpl::HandleTexParameterfv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleTexParameterfvImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::TexParameterfvImmediate& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLfloat), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -1882,7 +1882,7 @@ error::Error GLES2DecoderImpl::HandleTexParameterfvImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleTexParameteri(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::TexParameteri& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| @@ -1900,11 +1900,11 @@ error::Error GLES2DecoderImpl::HandleTexParameteri(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleTexParameteriv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::TexParameteriv& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLint), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -1926,11 +1926,11 @@ error::Error GLES2DecoderImpl::HandleTexParameteriv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleTexParameterivImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::TexParameterivImmediate& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum pname = static_cast<GLenum>(c.pname);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLint), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -1955,7 +1955,7 @@ error::Error GLES2DecoderImpl::HandleTexParameterivImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform1f(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform1f& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLfloat x = static_cast<GLfloat>(c.x);
|
| @@ -1967,11 +1967,11 @@ error::Error GLES2DecoderImpl::HandleUniform1f(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform1fv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform1fv& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -1985,11 +1985,11 @@ error::Error GLES2DecoderImpl::HandleUniform1fv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform1fvImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform1fvImmediate& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2006,7 +2006,7 @@ error::Error GLES2DecoderImpl::HandleUniform1fvImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform1i(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform1i& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLint x = static_cast<GLint>(c.x);
|
| @@ -2015,11 +2015,11 @@ error::Error GLES2DecoderImpl::HandleUniform1i(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform1iv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform1iv& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLint), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2033,11 +2033,11 @@ error::Error GLES2DecoderImpl::HandleUniform1iv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform1ivImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform1ivImmediate& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLint), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2054,7 +2054,7 @@ error::Error GLES2DecoderImpl::HandleUniform1ivImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform2f(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform2f& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLfloat x = static_cast<GLfloat>(c.x);
|
| @@ -2067,11 +2067,11 @@ error::Error GLES2DecoderImpl::HandleUniform2f(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform2fv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform2fv& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 2, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2085,11 +2085,11 @@ error::Error GLES2DecoderImpl::HandleUniform2fv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform2fvImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform2fvImmediate& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 2, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2106,7 +2106,7 @@ error::Error GLES2DecoderImpl::HandleUniform2fvImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform2i(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform2i& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLint x = static_cast<GLint>(c.x);
|
| @@ -2119,11 +2119,11 @@ error::Error GLES2DecoderImpl::HandleUniform2i(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform2iv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform2iv& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLint), 2, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2137,11 +2137,11 @@ error::Error GLES2DecoderImpl::HandleUniform2iv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform2ivImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform2ivImmediate& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLint), 2, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2158,7 +2158,7 @@ error::Error GLES2DecoderImpl::HandleUniform2ivImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform3f(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform3f& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLfloat x = static_cast<GLfloat>(c.x);
|
| @@ -2172,11 +2172,11 @@ error::Error GLES2DecoderImpl::HandleUniform3f(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform3fv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform3fv& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 3, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2190,11 +2190,11 @@ error::Error GLES2DecoderImpl::HandleUniform3fv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform3fvImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform3fvImmediate& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 3, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2211,7 +2211,7 @@ error::Error GLES2DecoderImpl::HandleUniform3fvImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform3i(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform3i& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLint x = static_cast<GLint>(c.x);
|
| @@ -2225,11 +2225,11 @@ error::Error GLES2DecoderImpl::HandleUniform3i(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform3iv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform3iv& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLint), 3, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2243,11 +2243,11 @@ error::Error GLES2DecoderImpl::HandleUniform3iv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform3ivImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform3ivImmediate& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLint), 3, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2264,7 +2264,7 @@ error::Error GLES2DecoderImpl::HandleUniform3ivImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform4f(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform4f& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLfloat x = static_cast<GLfloat>(c.x);
|
| @@ -2279,11 +2279,11 @@ error::Error GLES2DecoderImpl::HandleUniform4f(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform4fv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform4fv& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 4, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2297,11 +2297,11 @@ error::Error GLES2DecoderImpl::HandleUniform4fv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform4fvImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform4fvImmediate& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 4, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2318,7 +2318,7 @@ error::Error GLES2DecoderImpl::HandleUniform4fvImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform4i(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform4i& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLint x = static_cast<GLint>(c.x);
|
| @@ -2333,11 +2333,11 @@ error::Error GLES2DecoderImpl::HandleUniform4i(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform4iv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform4iv& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLint), 4, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2351,11 +2351,11 @@ error::Error GLES2DecoderImpl::HandleUniform4iv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniform4ivImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::Uniform4ivImmediate& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLint), 4, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2372,12 +2372,12 @@ error::Error GLES2DecoderImpl::HandleUniform4ivImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniformMatrix2fv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::UniformMatrix2fv& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| GLboolean transpose = static_cast<GLboolean>(c.transpose);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 4, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2396,12 +2396,12 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix2fv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniformMatrix2fvImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::UniformMatrix2fvImmediate& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| GLboolean transpose = static_cast<GLboolean>(c.transpose);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 4, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2423,12 +2423,12 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix2fvImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniformMatrix3fv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::UniformMatrix3fv& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| GLboolean transpose = static_cast<GLboolean>(c.transpose);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 9, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2447,12 +2447,12 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix3fv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniformMatrix3fvImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::UniformMatrix3fvImmediate& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| GLboolean transpose = static_cast<GLboolean>(c.transpose);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 9, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2474,12 +2474,12 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix3fvImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniformMatrix4fv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::UniformMatrix4fv& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| GLboolean transpose = static_cast<GLboolean>(c.transpose);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 16, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2498,12 +2498,12 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix4fv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUniformMatrix4fvImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::UniformMatrix4fvImmediate& c) {
|
| GLint location = static_cast<GLint>(c.location);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| GLboolean transpose = static_cast<GLboolean>(c.transpose);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLfloat), 16, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2525,7 +2525,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix4fvImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleUseProgram(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::UseProgram& c) {
|
| GLuint program = c.program;
|
| DoUseProgram(program);
|
| @@ -2533,7 +2533,7 @@ error::Error GLES2DecoderImpl::HandleUseProgram(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleValidateProgram(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::ValidateProgram& c) {
|
| GLuint program = c.program;
|
| DoValidateProgram(program);
|
| @@ -2541,7 +2541,7 @@ error::Error GLES2DecoderImpl::HandleValidateProgram(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleVertexAttrib1f(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::VertexAttrib1f& c) {
|
| GLuint indx = static_cast<GLuint>(c.indx);
|
| GLfloat x = static_cast<GLfloat>(c.x);
|
| @@ -2550,10 +2550,10 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib1f(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleVertexAttrib1fv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::VertexAttrib1fv& c) {
|
| GLuint indx = static_cast<GLuint>(c.indx);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLfloat), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2567,10 +2567,10 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib1fv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleVertexAttrib1fvImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::VertexAttrib1fvImmediate& c) {
|
| GLuint indx = static_cast<GLuint>(c.indx);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLfloat), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2587,7 +2587,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib1fvImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleVertexAttrib2f(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::VertexAttrib2f& c) {
|
| GLuint indx = static_cast<GLuint>(c.indx);
|
| GLfloat x = static_cast<GLfloat>(c.x);
|
| @@ -2597,10 +2597,10 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib2f(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleVertexAttrib2fv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::VertexAttrib2fv& c) {
|
| GLuint indx = static_cast<GLuint>(c.indx);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLfloat), 2, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2614,10 +2614,10 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib2fv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleVertexAttrib2fvImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::VertexAttrib2fvImmediate& c) {
|
| GLuint indx = static_cast<GLuint>(c.indx);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLfloat), 2, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2634,7 +2634,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib2fvImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleVertexAttrib3f(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::VertexAttrib3f& c) {
|
| GLuint indx = static_cast<GLuint>(c.indx);
|
| GLfloat x = static_cast<GLfloat>(c.x);
|
| @@ -2645,10 +2645,10 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib3f(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleVertexAttrib3fv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::VertexAttrib3fv& c) {
|
| GLuint indx = static_cast<GLuint>(c.indx);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLfloat), 3, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2662,10 +2662,10 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib3fv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleVertexAttrib3fvImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::VertexAttrib3fvImmediate& c) {
|
| GLuint indx = static_cast<GLuint>(c.indx);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLfloat), 3, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2682,7 +2682,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib3fvImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleVertexAttrib4f(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::VertexAttrib4f& c) {
|
| GLuint indx = static_cast<GLuint>(c.indx);
|
| GLfloat x = static_cast<GLfloat>(c.x);
|
| @@ -2694,10 +2694,10 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib4f(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleVertexAttrib4fv(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::VertexAttrib4fv& c) {
|
| GLuint indx = static_cast<GLuint>(c.indx);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLfloat), 4, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2711,10 +2711,10 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib4fv(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleVertexAttrib4fvImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::VertexAttrib4fvImmediate& c) {
|
| GLuint indx = static_cast<GLuint>(c.indx);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLfloat), 4, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2730,7 +2730,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib4fvImmediate(
|
| return error::kNoError;
|
| }
|
|
|
| -error::Error GLES2DecoderImpl::HandleViewport(uint32 immediate_data_size,
|
| +error::Error GLES2DecoderImpl::HandleViewport(uint32_t immediate_data_size,
|
| const gles2::cmds::Viewport& c) {
|
| GLint x = static_cast<GLint>(c.x);
|
| GLint y = static_cast<GLint>(c.y);
|
| @@ -2749,7 +2749,7 @@ error::Error GLES2DecoderImpl::HandleViewport(uint32 immediate_data_size,
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBlitFramebufferCHROMIUM(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BlitFramebufferCHROMIUM& c) {
|
| error::Error error;
|
| error = WillAccessBoundFramebufferForDraw();
|
| @@ -2779,7 +2779,7 @@ error::Error GLES2DecoderImpl::HandleBlitFramebufferCHROMIUM(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleRenderbufferStorageMultisampleCHROMIUM(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::RenderbufferStorageMultisampleCHROMIUM& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLsizei samples = static_cast<GLsizei>(c.samples);
|
| @@ -2821,7 +2821,7 @@ error::Error GLES2DecoderImpl::HandleRenderbufferStorageMultisampleCHROMIUM(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleRenderbufferStorageMultisampleEXT(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::RenderbufferStorageMultisampleEXT& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLsizei samples = static_cast<GLsizei>(c.samples);
|
| @@ -2860,7 +2860,7 @@ error::Error GLES2DecoderImpl::HandleRenderbufferStorageMultisampleEXT(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleFramebufferTexture2DMultisampleEXT(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::FramebufferTexture2DMultisampleEXT& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum attachment = static_cast<GLenum>(c.attachment);
|
| @@ -2901,7 +2901,7 @@ error::Error GLES2DecoderImpl::HandleFramebufferTexture2DMultisampleEXT(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleTexStorage2DEXT(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::TexStorage2DEXT& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLsizei levels = static_cast<GLsizei>(c.levels);
|
| @@ -2934,10 +2934,10 @@ error::Error GLES2DecoderImpl::HandleTexStorage2DEXT(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenQueriesEXT(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenQueriesEXT& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2953,10 +2953,10 @@ error::Error GLES2DecoderImpl::HandleGenQueriesEXT(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenQueriesEXTImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenQueriesEXTImmediate& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2972,10 +2972,10 @@ error::Error GLES2DecoderImpl::HandleGenQueriesEXTImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDeleteQueriesEXT(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DeleteQueriesEXT& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -2989,10 +2989,10 @@ error::Error GLES2DecoderImpl::HandleDeleteQueriesEXT(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDeleteQueriesEXTImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DeleteQueriesEXTImmediate& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -3006,7 +3006,7 @@ error::Error GLES2DecoderImpl::HandleDeleteQueriesEXTImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleInsertEventMarkerEXT(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::InsertEventMarkerEXT& c) {
|
| GLuint bucket_id = static_cast<GLuint>(c.bucket_id);
|
| Bucket* bucket = GetBucket(bucket_id);
|
| @@ -3022,7 +3022,7 @@ error::Error GLES2DecoderImpl::HandleInsertEventMarkerEXT(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandlePushGroupMarkerEXT(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::PushGroupMarkerEXT& c) {
|
| GLuint bucket_id = static_cast<GLuint>(c.bucket_id);
|
| Bucket* bucket = GetBucket(bucket_id);
|
| @@ -3038,17 +3038,17 @@ error::Error GLES2DecoderImpl::HandlePushGroupMarkerEXT(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandlePopGroupMarkerEXT(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::PopGroupMarkerEXT& c) {
|
| DoPopGroupMarkerEXT();
|
| return error::kNoError;
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenVertexArraysOES(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenVertexArraysOES& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -3064,10 +3064,10 @@ error::Error GLES2DecoderImpl::HandleGenVertexArraysOES(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGenVertexArraysOESImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GenVertexArraysOESImmediate& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -3083,10 +3083,10 @@ error::Error GLES2DecoderImpl::HandleGenVertexArraysOESImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDeleteVertexArraysOES(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DeleteVertexArraysOES& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -3100,10 +3100,10 @@ error::Error GLES2DecoderImpl::HandleDeleteVertexArraysOES(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDeleteVertexArraysOESImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DeleteVertexArraysOESImmediate& c) {
|
| GLsizei n = static_cast<GLsizei>(c.n);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -3117,7 +3117,7 @@ error::Error GLES2DecoderImpl::HandleDeleteVertexArraysOESImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleIsVertexArrayOES(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::IsVertexArrayOES& c) {
|
| GLuint array = c.array;
|
| typedef cmds::IsVertexArrayOES::Result Result;
|
| @@ -3131,7 +3131,7 @@ error::Error GLES2DecoderImpl::HandleIsVertexArrayOES(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBindVertexArrayOES(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BindVertexArrayOES& c) {
|
| GLuint array = c.array;
|
| DoBindVertexArrayOES(array);
|
| @@ -3139,14 +3139,14 @@ error::Error GLES2DecoderImpl::HandleBindVertexArrayOES(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleSwapBuffers(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::SwapBuffers& c) {
|
| DoSwapBuffers();
|
| return error::kNoError;
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleGetMaxValueInBufferCHROMIUM(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::GetMaxValueInBufferCHROMIUM& c) {
|
| GLuint buffer_id = c.buffer_id;
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| @@ -3173,7 +3173,7 @@ error::Error GLES2DecoderImpl::HandleGetMaxValueInBufferCHROMIUM(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleTexImageIOSurface2DCHROMIUM(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::TexImageIOSurface2DCHROMIUM& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLsizei width = static_cast<GLsizei>(c.width);
|
| @@ -3200,7 +3200,7 @@ error::Error GLES2DecoderImpl::HandleTexImageIOSurface2DCHROMIUM(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleCopyTextureCHROMIUM(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::CopyTextureCHROMIUM& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLenum source_id = static_cast<GLenum>(c.source_id);
|
| @@ -3225,10 +3225,10 @@ error::Error GLES2DecoderImpl::HandleCopyTextureCHROMIUM(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUM(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::ProduceTextureCHROMIUM& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLbyte), 64, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -3247,10 +3247,10 @@ error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUM(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUMImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::ProduceTextureCHROMIUMImmediate& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLbyte), 64, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -3272,10 +3272,10 @@ error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUMImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleConsumeTextureCHROMIUM(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::ConsumeTextureCHROMIUM& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLbyte), 64, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -3294,10 +3294,10 @@ error::Error GLES2DecoderImpl::HandleConsumeTextureCHROMIUM(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleConsumeTextureCHROMIUMImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::ConsumeTextureCHROMIUMImmediate& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(1, sizeof(GLbyte), 64, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -3319,7 +3319,7 @@ error::Error GLES2DecoderImpl::HandleConsumeTextureCHROMIUMImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleBindTexImage2DCHROMIUM(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::BindTexImage2DCHROMIUM& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLint imageId = static_cast<GLint>(c.imageId);
|
| @@ -3333,7 +3333,7 @@ error::Error GLES2DecoderImpl::HandleBindTexImage2DCHROMIUM(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleReleaseTexImage2DCHROMIUM(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::ReleaseTexImage2DCHROMIUM& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLint imageId = static_cast<GLint>(c.imageId);
|
| @@ -3347,18 +3347,18 @@ error::Error GLES2DecoderImpl::HandleReleaseTexImage2DCHROMIUM(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleTraceEndCHROMIUM(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::TraceEndCHROMIUM& c) {
|
| DoTraceEndCHROMIUM();
|
| return error::kNoError;
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDiscardFramebufferEXT(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DiscardFramebufferEXT& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLenum), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -3377,11 +3377,11 @@ error::Error GLES2DecoderImpl::HandleDiscardFramebufferEXT(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDiscardFramebufferEXTImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DiscardFramebufferEXTImmediate& c) {
|
| GLenum target = static_cast<GLenum>(c.target);
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLenum), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -3403,10 +3403,10 @@ error::Error GLES2DecoderImpl::HandleDiscardFramebufferEXTImmediate(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDrawBuffersEXT(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DrawBuffersEXT& c) {
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLenum), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
| @@ -3424,10 +3424,10 @@ error::Error GLES2DecoderImpl::HandleDrawBuffersEXT(
|
| }
|
|
|
| error::Error GLES2DecoderImpl::HandleDrawBuffersEXTImmediate(
|
| - uint32 immediate_data_size,
|
| + uint32_t immediate_data_size,
|
| const gles2::cmds::DrawBuffersEXTImmediate& c) {
|
| GLsizei count = static_cast<GLsizei>(c.count);
|
| - uint32 data_size;
|
| + uint32_t data_size;
|
| if (!ComputeDataSize(count, sizeof(GLenum), 1, &data_size)) {
|
| return error::kOutOfBounds;
|
| }
|
|
|