summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkloveless@chromium.org <kloveless@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-10 23:00:23 +0000
committerkloveless@chromium.org <kloveless@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-10 23:00:23 +0000
commite421391b11135c0661182f9f2ff1227902a873a0 (patch)
treeed3f09ec7af8bbf5b70b7fadaa32b68def671fb0
parenta27a581666af9ac6a01b839f4af0829dbe1be685 (diff)
downloadchromium_src-e421391b11135c0661182f9f2ff1227902a873a0.zip
chromium_src-e421391b11135c0661182f9f2ff1227902a873a0.tar.gz
chromium_src-e421391b11135c0661182f9f2ff1227902a873a0.tar.bz2
Removed HandleBufferDataImmediate.
BUG= Review URL: https://codereview.chromium.org/26369002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rwxr-xr-xgpu/command_buffer/build_gles2_cmd_buffer.py11
-rw-r--r--gpu/command_buffer/client/gles2_cmd_helper_autogen.h9
-rw-r--r--gpu/command_buffer/common/gles2_cmd_format_autogen.h46
-rw-r--r--gpu/command_buffer/common/gles2_cmd_format_test_autogen.h1
-rw-r--r--gpu/command_buffer/common/gles2_cmd_ids_autogen.h447
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc14
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h19
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h18
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h1
9 files changed, 244 insertions, 322 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index e2e1a63..64648d6 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -1265,7 +1265,7 @@ _FUNCTION_INFO = {
},
'BufferData': {
'type': 'Manual',
- 'immediate': True,
+ 'immediate': False,
'client_test': False,
},
'BufferSubData': {
@@ -3644,19 +3644,14 @@ class DataHandler(TypeHandler):
def WriteImmediateCmdGetTotalSize(self, func, file):
"""Overrriden from TypeHandler."""
# TODO(gman): Move this data to _FUNCTION_INFO?
- if func.name == 'BufferDataImmediate':
- file.Write(" uint32 total_size = ComputeSize(_size);\n")
- elif func.name == 'BufferSubDataImmediate':
+ if func.name == 'BufferSubDataImmediate':
file.Write(" uint32 total_size = ComputeSize(_size);\n")
elif func.name == 'CompressedTexSubImage2DImmediate':
file.Write(" uint32 total_size = ComputeSize(_imageSize);\n")
def WriteImmediateCmdSizeTest(self, func, file):
"""Overrriden from TypeHandler."""
- # TODO(gman): Move this data to _FUNCTION_INFO?
- if func.name == 'BufferDataImmediate':
- file.Write(" uint32 total_size = cmd.ComputeSize(cmd.size);\n")
- elif func.name == 'BufferSubDataImmediate':
+ if func.name == 'BufferSubDataImmediate':
file.Write(" uint32 total_size = cmd.ComputeSize(cmd.size);\n")
elif func.name == 'CompressedTexSubImage2DImmediate':
file.Write(" uint32 total_size = cmd.ComputeSize(cmd.imageSize);\n")
diff --git a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
index 8bb763c..5e1c1b5 100644
--- a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
+++ b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
@@ -131,15 +131,6 @@
}
}
- void BufferDataImmediate(GLenum target, GLsizeiptr size, GLenum usage) {
- const uint32 s = 0; // TODO(gman): compute correct size
- gles2::cmds::BufferDataImmediate* c =
- GetImmediateCmdSpaceTotalSize<gles2::cmds::BufferDataImmediate>(s);
- if (c) {
- c->Init(target, size, usage);
- }
- }
-
void BufferSubData(
GLenum target, GLintptr offset, GLsizeiptr size, uint32 data_shm_id,
uint32 data_shm_offset) {
diff --git a/gpu/command_buffer/common/gles2_cmd_format_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
index 73e82af..9d7b647 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
@@ -641,52 +641,6 @@ COMPILE_ASSERT(offsetof(BufferData, data_shm_offset) == 16,
COMPILE_ASSERT(offsetof(BufferData, usage) == 20,
OffsetOf_BufferData_usage_not_20);
-struct BufferDataImmediate {
- typedef BufferDataImmediate ValueType;
- static const CommandId kCmdId = kBufferDataImmediate;
- static const cmd::ArgFlags kArgFlags = cmd::kAtLeastN;
-
- static uint32 ComputeSize(uint32 size_in_bytes) {
- return static_cast<uint32>(
- sizeof(ValueType) + // NOLINT
- RoundSizeToMultipleOfEntries(size_in_bytes));
- }
-
- void SetHeader(uint32 size_in_bytes) {
- header.SetCmdByTotalSize<ValueType>(size_in_bytes);
- }
-
- void Init(GLenum _target, GLsizeiptr _size, GLenum _usage) {
- uint32 total_size = 0; // TODO(gman): get correct size.
- SetHeader(total_size);
- target = _target;
- size = _size;
- usage = _usage;
- }
-
- void* Set(void* cmd, GLenum _target, GLsizeiptr _size, GLenum _usage) {
- uint32 total_size = 0; // TODO(gman): get correct size.
- static_cast<ValueType*>(cmd)->Init(_target, _size, _usage);
- return NextImmediateCmdAddressTotalSize<ValueType>(cmd, total_size);
- }
-
- gpu::CommandHeader header;
- uint32 target;
- int32 size;
- uint32 usage;
-};
-
-COMPILE_ASSERT(sizeof(BufferDataImmediate) == 16,
- Sizeof_BufferDataImmediate_is_not_16);
-COMPILE_ASSERT(offsetof(BufferDataImmediate, header) == 0,
- OffsetOf_BufferDataImmediate_header_not_0);
-COMPILE_ASSERT(offsetof(BufferDataImmediate, target) == 4,
- OffsetOf_BufferDataImmediate_target_not_4);
-COMPILE_ASSERT(offsetof(BufferDataImmediate, size) == 8,
- OffsetOf_BufferDataImmediate_size_not_8);
-COMPILE_ASSERT(offsetof(BufferDataImmediate, usage) == 12,
- OffsetOf_BufferDataImmediate_usage_not_12);
-
struct BufferSubData {
typedef BufferSubData ValueType;
static const CommandId kCmdId = kBufferSubData;
diff --git a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
index 4b03509..a5e8bbe 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
@@ -271,7 +271,6 @@ TEST_F(GLES2FormatTest, BufferData) {
next_cmd, sizeof(cmd));
}
-// TODO(gman): Implement test for BufferDataImmediate
TEST_F(GLES2FormatTest, BufferSubData) {
cmds::BufferSubData& cmd = *GetBufferAs<cmds::BufferSubData>();
void* next_cmd = cmd.Set(
diff --git a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
index 1c58cd8..b961b26 100644
--- a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
@@ -25,230 +25,229 @@
OP(BlendFunc) /* 268 */ \
OP(BlendFuncSeparate) /* 269 */ \
OP(BufferData) /* 270 */ \
- OP(BufferDataImmediate) /* 271 */ \
- OP(BufferSubData) /* 272 */ \
- OP(BufferSubDataImmediate) /* 273 */ \
- OP(CheckFramebufferStatus) /* 274 */ \
- OP(Clear) /* 275 */ \
- OP(ClearColor) /* 276 */ \
- OP(ClearDepthf) /* 277 */ \
- OP(ClearStencil) /* 278 */ \
- OP(ColorMask) /* 279 */ \
- OP(CompileShader) /* 280 */ \
- OP(CompressedTexImage2D) /* 281 */ \
- OP(CompressedTexImage2DBucket) /* 282 */ \
- OP(CompressedTexSubImage2D) /* 283 */ \
- OP(CompressedTexSubImage2DImmediate) /* 284 */ \
- OP(CompressedTexSubImage2DBucket) /* 285 */ \
- OP(CopyTexImage2D) /* 286 */ \
- OP(CopyTexSubImage2D) /* 287 */ \
- OP(CreateProgram) /* 288 */ \
- OP(CreateShader) /* 289 */ \
- OP(CullFace) /* 290 */ \
- OP(DeleteBuffers) /* 291 */ \
- OP(DeleteBuffersImmediate) /* 292 */ \
- OP(DeleteFramebuffers) /* 293 */ \
- OP(DeleteFramebuffersImmediate) /* 294 */ \
- OP(DeleteProgram) /* 295 */ \
- OP(DeleteRenderbuffers) /* 296 */ \
- OP(DeleteRenderbuffersImmediate) /* 297 */ \
- OP(DeleteShader) /* 298 */ \
- OP(DeleteTextures) /* 299 */ \
- OP(DeleteTexturesImmediate) /* 300 */ \
- OP(DepthFunc) /* 301 */ \
- OP(DepthMask) /* 302 */ \
- OP(DepthRangef) /* 303 */ \
- OP(DetachShader) /* 304 */ \
- OP(Disable) /* 305 */ \
- OP(DisableVertexAttribArray) /* 306 */ \
- OP(DrawArrays) /* 307 */ \
- OP(DrawElements) /* 308 */ \
- OP(Enable) /* 309 */ \
- OP(EnableVertexAttribArray) /* 310 */ \
- OP(Finish) /* 311 */ \
- OP(Flush) /* 312 */ \
- OP(FramebufferRenderbuffer) /* 313 */ \
- OP(FramebufferTexture2D) /* 314 */ \
- OP(FrontFace) /* 315 */ \
- OP(GenBuffers) /* 316 */ \
- OP(GenBuffersImmediate) /* 317 */ \
- OP(GenerateMipmap) /* 318 */ \
- OP(GenFramebuffers) /* 319 */ \
- OP(GenFramebuffersImmediate) /* 320 */ \
- OP(GenRenderbuffers) /* 321 */ \
- OP(GenRenderbuffersImmediate) /* 322 */ \
- OP(GenTextures) /* 323 */ \
- OP(GenTexturesImmediate) /* 324 */ \
- OP(GetActiveAttrib) /* 325 */ \
- OP(GetActiveUniform) /* 326 */ \
- OP(GetAttachedShaders) /* 327 */ \
- OP(GetAttribLocation) /* 328 */ \
- OP(GetAttribLocationBucket) /* 329 */ \
- OP(GetBooleanv) /* 330 */ \
- OP(GetBufferParameteriv) /* 331 */ \
- OP(GetError) /* 332 */ \
- OP(GetFloatv) /* 333 */ \
- OP(GetFramebufferAttachmentParameteriv) /* 334 */ \
- OP(GetIntegerv) /* 335 */ \
- OP(GetProgramiv) /* 336 */ \
- OP(GetProgramInfoLog) /* 337 */ \
- OP(GetRenderbufferParameteriv) /* 338 */ \
- OP(GetShaderiv) /* 339 */ \
- OP(GetShaderInfoLog) /* 340 */ \
- OP(GetShaderPrecisionFormat) /* 341 */ \
- OP(GetShaderSource) /* 342 */ \
- OP(GetString) /* 343 */ \
- OP(GetTexParameterfv) /* 344 */ \
- OP(GetTexParameteriv) /* 345 */ \
- OP(GetUniformfv) /* 346 */ \
- OP(GetUniformiv) /* 347 */ \
- OP(GetUniformLocation) /* 348 */ \
- OP(GetUniformLocationBucket) /* 349 */ \
- OP(GetVertexAttribfv) /* 350 */ \
- OP(GetVertexAttribiv) /* 351 */ \
- OP(GetVertexAttribPointerv) /* 352 */ \
- OP(Hint) /* 353 */ \
- OP(IsBuffer) /* 354 */ \
- OP(IsEnabled) /* 355 */ \
- OP(IsFramebuffer) /* 356 */ \
- OP(IsProgram) /* 357 */ \
- OP(IsRenderbuffer) /* 358 */ \
- OP(IsShader) /* 359 */ \
- OP(IsTexture) /* 360 */ \
- OP(LineWidth) /* 361 */ \
- OP(LinkProgram) /* 362 */ \
- OP(PixelStorei) /* 363 */ \
- OP(PolygonOffset) /* 364 */ \
- OP(ReadPixels) /* 365 */ \
- OP(ReleaseShaderCompiler) /* 366 */ \
- OP(RenderbufferStorage) /* 367 */ \
- OP(SampleCoverage) /* 368 */ \
- OP(Scissor) /* 369 */ \
- OP(ShaderBinary) /* 370 */ \
- OP(ShaderSource) /* 371 */ \
- OP(ShaderSourceImmediate) /* 372 */ \
- OP(ShaderSourceBucket) /* 373 */ \
- OP(StencilFunc) /* 374 */ \
- OP(StencilFuncSeparate) /* 375 */ \
- OP(StencilMask) /* 376 */ \
- OP(StencilMaskSeparate) /* 377 */ \
- OP(StencilOp) /* 378 */ \
- OP(StencilOpSeparate) /* 379 */ \
- OP(TexImage2D) /* 380 */ \
- OP(TexParameterf) /* 381 */ \
- OP(TexParameterfv) /* 382 */ \
- OP(TexParameterfvImmediate) /* 383 */ \
- OP(TexParameteri) /* 384 */ \
- OP(TexParameteriv) /* 385 */ \
- OP(TexParameterivImmediate) /* 386 */ \
- OP(TexSubImage2D) /* 387 */ \
- OP(Uniform1f) /* 388 */ \
- OP(Uniform1fv) /* 389 */ \
- OP(Uniform1fvImmediate) /* 390 */ \
- OP(Uniform1i) /* 391 */ \
- OP(Uniform1iv) /* 392 */ \
- OP(Uniform1ivImmediate) /* 393 */ \
- OP(Uniform2f) /* 394 */ \
- OP(Uniform2fv) /* 395 */ \
- OP(Uniform2fvImmediate) /* 396 */ \
- OP(Uniform2i) /* 397 */ \
- OP(Uniform2iv) /* 398 */ \
- OP(Uniform2ivImmediate) /* 399 */ \
- OP(Uniform3f) /* 400 */ \
- OP(Uniform3fv) /* 401 */ \
- OP(Uniform3fvImmediate) /* 402 */ \
- OP(Uniform3i) /* 403 */ \
- OP(Uniform3iv) /* 404 */ \
- OP(Uniform3ivImmediate) /* 405 */ \
- OP(Uniform4f) /* 406 */ \
- OP(Uniform4fv) /* 407 */ \
- OP(Uniform4fvImmediate) /* 408 */ \
- OP(Uniform4i) /* 409 */ \
- OP(Uniform4iv) /* 410 */ \
- OP(Uniform4ivImmediate) /* 411 */ \
- OP(UniformMatrix2fv) /* 412 */ \
- OP(UniformMatrix2fvImmediate) /* 413 */ \
- OP(UniformMatrix3fv) /* 414 */ \
- OP(UniformMatrix3fvImmediate) /* 415 */ \
- OP(UniformMatrix4fv) /* 416 */ \
- OP(UniformMatrix4fvImmediate) /* 417 */ \
- OP(UseProgram) /* 418 */ \
- OP(ValidateProgram) /* 419 */ \
- OP(VertexAttrib1f) /* 420 */ \
- OP(VertexAttrib1fv) /* 421 */ \
- OP(VertexAttrib1fvImmediate) /* 422 */ \
- OP(VertexAttrib2f) /* 423 */ \
- OP(VertexAttrib2fv) /* 424 */ \
- OP(VertexAttrib2fvImmediate) /* 425 */ \
- OP(VertexAttrib3f) /* 426 */ \
- OP(VertexAttrib3fv) /* 427 */ \
- OP(VertexAttrib3fvImmediate) /* 428 */ \
- OP(VertexAttrib4f) /* 429 */ \
- OP(VertexAttrib4fv) /* 430 */ \
- OP(VertexAttrib4fvImmediate) /* 431 */ \
- OP(VertexAttribPointer) /* 432 */ \
- OP(Viewport) /* 433 */ \
- OP(BlitFramebufferEXT) /* 434 */ \
- OP(RenderbufferStorageMultisampleEXT) /* 435 */ \
- OP(FramebufferTexture2DMultisampleEXT) /* 436 */ \
- OP(TexStorage2DEXT) /* 437 */ \
- OP(GenQueriesEXT) /* 438 */ \
- OP(GenQueriesEXTImmediate) /* 439 */ \
- OP(DeleteQueriesEXT) /* 440 */ \
- OP(DeleteQueriesEXTImmediate) /* 441 */ \
- OP(BeginQueryEXT) /* 442 */ \
- OP(EndQueryEXT) /* 443 */ \
- OP(InsertEventMarkerEXT) /* 444 */ \
- OP(PushGroupMarkerEXT) /* 445 */ \
- OP(PopGroupMarkerEXT) /* 446 */ \
- OP(GenVertexArraysOES) /* 447 */ \
- OP(GenVertexArraysOESImmediate) /* 448 */ \
- OP(DeleteVertexArraysOES) /* 449 */ \
- OP(DeleteVertexArraysOESImmediate) /* 450 */ \
- OP(IsVertexArrayOES) /* 451 */ \
- OP(BindVertexArrayOES) /* 452 */ \
- OP(SwapBuffers) /* 453 */ \
- OP(GetMaxValueInBufferCHROMIUM) /* 454 */ \
- OP(GenSharedIdsCHROMIUM) /* 455 */ \
- OP(DeleteSharedIdsCHROMIUM) /* 456 */ \
- OP(RegisterSharedIdsCHROMIUM) /* 457 */ \
- OP(EnableFeatureCHROMIUM) /* 458 */ \
- OP(ResizeCHROMIUM) /* 459 */ \
- OP(GetRequestableExtensionsCHROMIUM) /* 460 */ \
- OP(RequestExtensionCHROMIUM) /* 461 */ \
- OP(GetMultipleIntegervCHROMIUM) /* 462 */ \
- OP(GetProgramInfoCHROMIUM) /* 463 */ \
- OP(CreateStreamTextureCHROMIUM) /* 464 */ \
- OP(DestroyStreamTextureCHROMIUM) /* 465 */ \
- OP(GetTranslatedShaderSourceANGLE) /* 466 */ \
- OP(PostSubBufferCHROMIUM) /* 467 */ \
- OP(TexImageIOSurface2DCHROMIUM) /* 468 */ \
- OP(CopyTextureCHROMIUM) /* 469 */ \
- OP(DrawArraysInstancedANGLE) /* 470 */ \
- OP(DrawElementsInstancedANGLE) /* 471 */ \
- OP(VertexAttribDivisorANGLE) /* 472 */ \
- OP(GenMailboxCHROMIUM) /* 473 */ \
- OP(ProduceTextureCHROMIUM) /* 474 */ \
- OP(ProduceTextureCHROMIUMImmediate) /* 475 */ \
- OP(ConsumeTextureCHROMIUM) /* 476 */ \
- OP(ConsumeTextureCHROMIUMImmediate) /* 477 */ \
- OP(BindUniformLocationCHROMIUM) /* 478 */ \
- OP(BindUniformLocationCHROMIUMImmediate) /* 479 */ \
- OP(BindUniformLocationCHROMIUMBucket) /* 480 */ \
- OP(BindTexImage2DCHROMIUM) /* 481 */ \
- OP(ReleaseTexImage2DCHROMIUM) /* 482 */ \
- OP(TraceBeginCHROMIUM) /* 483 */ \
- OP(TraceEndCHROMIUM) /* 484 */ \
- OP(AsyncTexSubImage2DCHROMIUM) /* 485 */ \
- OP(AsyncTexImage2DCHROMIUM) /* 486 */ \
- OP(WaitAsyncTexImage2DCHROMIUM) /* 487 */ \
- OP(DiscardFramebufferEXT) /* 488 */ \
- OP(DiscardFramebufferEXTImmediate) /* 489 */ \
- OP(LoseContextCHROMIUM) /* 490 */ \
- OP(InsertSyncPointCHROMIUM) /* 491 */ \
- OP(WaitSyncPointCHROMIUM) /* 492 */ \
- OP(DrawBuffersEXT) /* 493 */ \
- OP(DrawBuffersEXTImmediate) /* 494 */ \
+ OP(BufferSubData) /* 271 */ \
+ OP(BufferSubDataImmediate) /* 272 */ \
+ OP(CheckFramebufferStatus) /* 273 */ \
+ OP(Clear) /* 274 */ \
+ OP(ClearColor) /* 275 */ \
+ OP(ClearDepthf) /* 276 */ \
+ OP(ClearStencil) /* 277 */ \
+ OP(ColorMask) /* 278 */ \
+ OP(CompileShader) /* 279 */ \
+ OP(CompressedTexImage2D) /* 280 */ \
+ OP(CompressedTexImage2DBucket) /* 281 */ \
+ OP(CompressedTexSubImage2D) /* 282 */ \
+ OP(CompressedTexSubImage2DImmediate) /* 283 */ \
+ OP(CompressedTexSubImage2DBucket) /* 284 */ \
+ OP(CopyTexImage2D) /* 285 */ \
+ OP(CopyTexSubImage2D) /* 286 */ \
+ OP(CreateProgram) /* 287 */ \
+ OP(CreateShader) /* 288 */ \
+ OP(CullFace) /* 289 */ \
+ OP(DeleteBuffers) /* 290 */ \
+ OP(DeleteBuffersImmediate) /* 291 */ \
+ OP(DeleteFramebuffers) /* 292 */ \
+ OP(DeleteFramebuffersImmediate) /* 293 */ \
+ OP(DeleteProgram) /* 294 */ \
+ OP(DeleteRenderbuffers) /* 295 */ \
+ OP(DeleteRenderbuffersImmediate) /* 296 */ \
+ OP(DeleteShader) /* 297 */ \
+ OP(DeleteTextures) /* 298 */ \
+ OP(DeleteTexturesImmediate) /* 299 */ \
+ OP(DepthFunc) /* 300 */ \
+ OP(DepthMask) /* 301 */ \
+ OP(DepthRangef) /* 302 */ \
+ OP(DetachShader) /* 303 */ \
+ OP(Disable) /* 304 */ \
+ OP(DisableVertexAttribArray) /* 305 */ \
+ OP(DrawArrays) /* 306 */ \
+ OP(DrawElements) /* 307 */ \
+ OP(Enable) /* 308 */ \
+ OP(EnableVertexAttribArray) /* 309 */ \
+ OP(Finish) /* 310 */ \
+ OP(Flush) /* 311 */ \
+ OP(FramebufferRenderbuffer) /* 312 */ \
+ OP(FramebufferTexture2D) /* 313 */ \
+ OP(FrontFace) /* 314 */ \
+ OP(GenBuffers) /* 315 */ \
+ OP(GenBuffersImmediate) /* 316 */ \
+ OP(GenerateMipmap) /* 317 */ \
+ OP(GenFramebuffers) /* 318 */ \
+ OP(GenFramebuffersImmediate) /* 319 */ \
+ OP(GenRenderbuffers) /* 320 */ \
+ OP(GenRenderbuffersImmediate) /* 321 */ \
+ OP(GenTextures) /* 322 */ \
+ OP(GenTexturesImmediate) /* 323 */ \
+ OP(GetActiveAttrib) /* 324 */ \
+ OP(GetActiveUniform) /* 325 */ \
+ OP(GetAttachedShaders) /* 326 */ \
+ OP(GetAttribLocation) /* 327 */ \
+ OP(GetAttribLocationBucket) /* 328 */ \
+ OP(GetBooleanv) /* 329 */ \
+ OP(GetBufferParameteriv) /* 330 */ \
+ OP(GetError) /* 331 */ \
+ OP(GetFloatv) /* 332 */ \
+ OP(GetFramebufferAttachmentParameteriv) /* 333 */ \
+ OP(GetIntegerv) /* 334 */ \
+ OP(GetProgramiv) /* 335 */ \
+ OP(GetProgramInfoLog) /* 336 */ \
+ OP(GetRenderbufferParameteriv) /* 337 */ \
+ OP(GetShaderiv) /* 338 */ \
+ OP(GetShaderInfoLog) /* 339 */ \
+ OP(GetShaderPrecisionFormat) /* 340 */ \
+ OP(GetShaderSource) /* 341 */ \
+ OP(GetString) /* 342 */ \
+ OP(GetTexParameterfv) /* 343 */ \
+ OP(GetTexParameteriv) /* 344 */ \
+ OP(GetUniformfv) /* 345 */ \
+ OP(GetUniformiv) /* 346 */ \
+ OP(GetUniformLocation) /* 347 */ \
+ OP(GetUniformLocationBucket) /* 348 */ \
+ OP(GetVertexAttribfv) /* 349 */ \
+ OP(GetVertexAttribiv) /* 350 */ \
+ OP(GetVertexAttribPointerv) /* 351 */ \
+ OP(Hint) /* 352 */ \
+ OP(IsBuffer) /* 353 */ \
+ OP(IsEnabled) /* 354 */ \
+ OP(IsFramebuffer) /* 355 */ \
+ OP(IsProgram) /* 356 */ \
+ OP(IsRenderbuffer) /* 357 */ \
+ OP(IsShader) /* 358 */ \
+ OP(IsTexture) /* 359 */ \
+ OP(LineWidth) /* 360 */ \
+ OP(LinkProgram) /* 361 */ \
+ OP(PixelStorei) /* 362 */ \
+ OP(PolygonOffset) /* 363 */ \
+ OP(ReadPixels) /* 364 */ \
+ OP(ReleaseShaderCompiler) /* 365 */ \
+ OP(RenderbufferStorage) /* 366 */ \
+ OP(SampleCoverage) /* 367 */ \
+ OP(Scissor) /* 368 */ \
+ OP(ShaderBinary) /* 369 */ \
+ OP(ShaderSource) /* 370 */ \
+ OP(ShaderSourceImmediate) /* 371 */ \
+ OP(ShaderSourceBucket) /* 372 */ \
+ OP(StencilFunc) /* 373 */ \
+ OP(StencilFuncSeparate) /* 374 */ \
+ OP(StencilMask) /* 375 */ \
+ OP(StencilMaskSeparate) /* 376 */ \
+ OP(StencilOp) /* 377 */ \
+ OP(StencilOpSeparate) /* 378 */ \
+ OP(TexImage2D) /* 379 */ \
+ OP(TexParameterf) /* 380 */ \
+ OP(TexParameterfv) /* 381 */ \
+ OP(TexParameterfvImmediate) /* 382 */ \
+ OP(TexParameteri) /* 383 */ \
+ OP(TexParameteriv) /* 384 */ \
+ OP(TexParameterivImmediate) /* 385 */ \
+ OP(TexSubImage2D) /* 386 */ \
+ OP(Uniform1f) /* 387 */ \
+ OP(Uniform1fv) /* 388 */ \
+ OP(Uniform1fvImmediate) /* 389 */ \
+ OP(Uniform1i) /* 390 */ \
+ OP(Uniform1iv) /* 391 */ \
+ OP(Uniform1ivImmediate) /* 392 */ \
+ OP(Uniform2f) /* 393 */ \
+ OP(Uniform2fv) /* 394 */ \
+ OP(Uniform2fvImmediate) /* 395 */ \
+ OP(Uniform2i) /* 396 */ \
+ OP(Uniform2iv) /* 397 */ \
+ OP(Uniform2ivImmediate) /* 398 */ \
+ OP(Uniform3f) /* 399 */ \
+ OP(Uniform3fv) /* 400 */ \
+ OP(Uniform3fvImmediate) /* 401 */ \
+ OP(Uniform3i) /* 402 */ \
+ OP(Uniform3iv) /* 403 */ \
+ OP(Uniform3ivImmediate) /* 404 */ \
+ OP(Uniform4f) /* 405 */ \
+ OP(Uniform4fv) /* 406 */ \
+ OP(Uniform4fvImmediate) /* 407 */ \
+ OP(Uniform4i) /* 408 */ \
+ OP(Uniform4iv) /* 409 */ \
+ OP(Uniform4ivImmediate) /* 410 */ \
+ OP(UniformMatrix2fv) /* 411 */ \
+ OP(UniformMatrix2fvImmediate) /* 412 */ \
+ OP(UniformMatrix3fv) /* 413 */ \
+ OP(UniformMatrix3fvImmediate) /* 414 */ \
+ OP(UniformMatrix4fv) /* 415 */ \
+ OP(UniformMatrix4fvImmediate) /* 416 */ \
+ OP(UseProgram) /* 417 */ \
+ OP(ValidateProgram) /* 418 */ \
+ OP(VertexAttrib1f) /* 419 */ \
+ OP(VertexAttrib1fv) /* 420 */ \
+ OP(VertexAttrib1fvImmediate) /* 421 */ \
+ OP(VertexAttrib2f) /* 422 */ \
+ OP(VertexAttrib2fv) /* 423 */ \
+ OP(VertexAttrib2fvImmediate) /* 424 */ \
+ OP(VertexAttrib3f) /* 425 */ \
+ OP(VertexAttrib3fv) /* 426 */ \
+ OP(VertexAttrib3fvImmediate) /* 427 */ \
+ OP(VertexAttrib4f) /* 428 */ \
+ OP(VertexAttrib4fv) /* 429 */ \
+ OP(VertexAttrib4fvImmediate) /* 430 */ \
+ OP(VertexAttribPointer) /* 431 */ \
+ OP(Viewport) /* 432 */ \
+ OP(BlitFramebufferEXT) /* 433 */ \
+ OP(RenderbufferStorageMultisampleEXT) /* 434 */ \
+ OP(FramebufferTexture2DMultisampleEXT) /* 435 */ \
+ OP(TexStorage2DEXT) /* 436 */ \
+ OP(GenQueriesEXT) /* 437 */ \
+ OP(GenQueriesEXTImmediate) /* 438 */ \
+ OP(DeleteQueriesEXT) /* 439 */ \
+ OP(DeleteQueriesEXTImmediate) /* 440 */ \
+ OP(BeginQueryEXT) /* 441 */ \
+ OP(EndQueryEXT) /* 442 */ \
+ OP(InsertEventMarkerEXT) /* 443 */ \
+ OP(PushGroupMarkerEXT) /* 444 */ \
+ OP(PopGroupMarkerEXT) /* 445 */ \
+ OP(GenVertexArraysOES) /* 446 */ \
+ OP(GenVertexArraysOESImmediate) /* 447 */ \
+ OP(DeleteVertexArraysOES) /* 448 */ \
+ OP(DeleteVertexArraysOESImmediate) /* 449 */ \
+ OP(IsVertexArrayOES) /* 450 */ \
+ OP(BindVertexArrayOES) /* 451 */ \
+ OP(SwapBuffers) /* 452 */ \
+ OP(GetMaxValueInBufferCHROMIUM) /* 453 */ \
+ OP(GenSharedIdsCHROMIUM) /* 454 */ \
+ OP(DeleteSharedIdsCHROMIUM) /* 455 */ \
+ OP(RegisterSharedIdsCHROMIUM) /* 456 */ \
+ OP(EnableFeatureCHROMIUM) /* 457 */ \
+ OP(ResizeCHROMIUM) /* 458 */ \
+ OP(GetRequestableExtensionsCHROMIUM) /* 459 */ \
+ OP(RequestExtensionCHROMIUM) /* 460 */ \
+ OP(GetMultipleIntegervCHROMIUM) /* 461 */ \
+ OP(GetProgramInfoCHROMIUM) /* 462 */ \
+ OP(CreateStreamTextureCHROMIUM) /* 463 */ \
+ OP(DestroyStreamTextureCHROMIUM) /* 464 */ \
+ OP(GetTranslatedShaderSourceANGLE) /* 465 */ \
+ OP(PostSubBufferCHROMIUM) /* 466 */ \
+ OP(TexImageIOSurface2DCHROMIUM) /* 467 */ \
+ OP(CopyTextureCHROMIUM) /* 468 */ \
+ OP(DrawArraysInstancedANGLE) /* 469 */ \
+ OP(DrawElementsInstancedANGLE) /* 470 */ \
+ OP(VertexAttribDivisorANGLE) /* 471 */ \
+ OP(GenMailboxCHROMIUM) /* 472 */ \
+ OP(ProduceTextureCHROMIUM) /* 473 */ \
+ OP(ProduceTextureCHROMIUMImmediate) /* 474 */ \
+ OP(ConsumeTextureCHROMIUM) /* 475 */ \
+ OP(ConsumeTextureCHROMIUMImmediate) /* 476 */ \
+ OP(BindUniformLocationCHROMIUM) /* 477 */ \
+ OP(BindUniformLocationCHROMIUMImmediate) /* 478 */ \
+ OP(BindUniformLocationCHROMIUMBucket) /* 479 */ \
+ OP(BindTexImage2DCHROMIUM) /* 480 */ \
+ OP(ReleaseTexImage2DCHROMIUM) /* 481 */ \
+ OP(TraceBeginCHROMIUM) /* 482 */ \
+ OP(TraceEndCHROMIUM) /* 483 */ \
+ OP(AsyncTexSubImage2DCHROMIUM) /* 484 */ \
+ OP(AsyncTexImage2DCHROMIUM) /* 485 */ \
+ OP(WaitAsyncTexImage2DCHROMIUM) /* 486 */ \
+ OP(DiscardFramebufferEXT) /* 487 */ \
+ OP(DiscardFramebufferEXTImmediate) /* 488 */ \
+ OP(LoseContextCHROMIUM) /* 489 */ \
+ OP(InsertSyncPointCHROMIUM) /* 490 */ \
+ OP(WaitSyncPointCHROMIUM) /* 491 */ \
+ OP(DrawBuffersEXT) /* 492 */ \
+ OP(DrawBuffersEXTImmediate) /* 493 */ \
enum CommandId {
kStartPoint = cmd::kLastCommonId, // All GLES2 commands start after this.
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 9867a30..823e79f 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -7382,20 +7382,6 @@ error::Error GLES2DecoderImpl::HandleBufferData(
return error::kNoError;
}
-error::Error GLES2DecoderImpl::HandleBufferDataImmediate(
- uint32 immediate_data_size, const cmds::BufferDataImmediate& c) {
- GLenum target = static_cast<GLenum>(c.target);
- GLsizeiptr size = static_cast<GLsizeiptr>(c.size);
- const void* data = GetImmediateDataAs<const void*>(
- c, size, immediate_data_size);
- if (!data) {
- return error::kOutOfBounds;
- }
- GLenum usage = static_cast<GLenum>(c.usage);
- buffer_manager()->ValidateAndDoBufferData(&state_, target, size, data, usage);
- return error::kNoError;
-}
-
void GLES2DecoderImpl::DoBufferSubData(
GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid * data) {
// Just delegate it. Some validation is actually done before this.
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
index 1c0aa95..4cfcb51 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
@@ -265,8 +265,6 @@ TEST_F(GLES2DecoderTest1, BlendFuncSeparateValidArgs) {
}
// TODO(gman): BufferData
-// TODO(gman): BufferDataImmediate
-
// TODO(gman): BufferSubData
// TODO(gman): BufferSubDataImmediate
@@ -1921,5 +1919,22 @@ TEST_F(GLES2DecoderTest1, HintInvalidArgs0_0) {
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_ENUM, GetGLError());
}
+
+TEST_F(GLES2DecoderTest1, IsBufferValidArgs) {
+ SpecializedSetup<cmds::IsBuffer, 0>(true);
+ cmds::IsBuffer cmd;
+ cmd.Init(client_buffer_id_, shared_memory_id_, shared_memory_offset_);
+ EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ EXPECT_EQ(GL_NO_ERROR, GetGLError());
+}
+
+TEST_F(GLES2DecoderTest1, IsBufferInvalidArgsBadSharedMemoryId) {
+ SpecializedSetup<cmds::IsBuffer, 0>(false);
+ cmds::IsBuffer cmd;
+ cmd.Init(client_buffer_id_, kInvalidSharedMemoryId, shared_memory_offset_);
+ EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
+ cmd.Init(client_buffer_id_, shared_memory_id_, kInvalidSharedMemoryOffset);
+ EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
+}
#endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_1_AUTOGEN_H_
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
index 21362ef..f3b7d4b 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h
@@ -11,23 +11,6 @@
#define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_2_AUTOGEN_H_
-TEST_F(GLES2DecoderTest2, IsBufferValidArgs) {
- SpecializedSetup<cmds::IsBuffer, 0>(true);
- cmds::IsBuffer cmd;
- cmd.Init(client_buffer_id_, shared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
- EXPECT_EQ(GL_NO_ERROR, GetGLError());
-}
-
-TEST_F(GLES2DecoderTest2, IsBufferInvalidArgsBadSharedMemoryId) {
- SpecializedSetup<cmds::IsBuffer, 0>(false);
- cmds::IsBuffer cmd;
- cmd.Init(client_buffer_id_, kInvalidSharedMemoryId, shared_memory_offset_);
- EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
- cmd.Init(client_buffer_id_, shared_memory_id_, kInvalidSharedMemoryOffset);
- EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
-}
-
TEST_F(GLES2DecoderTest2, IsEnabledValidArgs) {
SpecializedSetup<cmds::IsEnabled, 0>(true);
cmds::IsEnabled cmd;
@@ -1702,5 +1685,6 @@ TEST_F(GLES2DecoderTest2, PopGroupMarkerEXTValidArgs) {
// TODO(gman): DeleteVertexArraysOES
// TODO(gman): DeleteVertexArraysOESImmediate
// TODO(gman): IsVertexArrayOES
+// TODO(gman): BindVertexArrayOES
#endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_2_AUTOGEN_H_
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
index 19efa9e..8b3f217 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h
@@ -10,7 +10,6 @@
#ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_3_AUTOGEN_H_
#define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_3_AUTOGEN_H_
-// TODO(gman): BindVertexArrayOES
// TODO(gman): SwapBuffers
// TODO(gman): GetMaxValueInBufferCHROMIUM
// TODO(gman): GenSharedIdsCHROMIUM
generated by cgit v1.1 at 2025-03-10 17:05:29 +0000