summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-10 22:41:58 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-10 22:41:58 +0000
commita19fd88e26b76a970649ff76c27076b5a64bd91c (patch)
treed1d12933449bc0b554941edd8e0e56f4f1b2db02 /gpu
parent1d753141e20ccf7b223fd750594327f77a084a1f (diff)
downloadchromium_src-a19fd88e26b76a970649ff76c27076b5a64bd91c.zip
chromium_src-a19fd88e26b76a970649ff76c27076b5a64bd91c.tar.gz
chromium_src-a19fd88e26b76a970649ff76c27076b5a64bd91c.tar.bz2
Delete copy_texture_to_parent_texture from GPU command buffer code.
Because we aren't using it for anything anymore. Review URL: http://codereview.chromium.org/7538008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rwxr-xr-xgpu/command_buffer/build_gles2_cmd_buffer.py87
-rw-r--r--gpu/command_buffer/client/gles2_c_lib_autogen.h5
-rw-r--r--gpu/command_buffer/client/gles2_cmd_helper_autogen.h7
-rw-r--r--gpu/command_buffer/client/gles2_implementation.cc9
-rw-r--r--gpu/command_buffer/client/gles2_implementation_autogen.h3
-rw-r--r--gpu/command_buffer/common/gles2_cmd_format_autogen.h130
-rw-r--r--gpu/command_buffer/common/gles2_cmd_format_test_autogen.h48
-rw-r--r--gpu/command_buffer/common/gles2_cmd_id_test_autogen.h4
-rw-r--r--gpu/command_buffer/common/gles2_cmd_ids_autogen.h4
-rw-r--r--gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h4
-rw-r--r--gpu/command_buffer/service/feature_info.cc1
-rw-r--r--gpu/command_buffer/service/feature_info_unittest.cc2
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc42
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_autogen.h21
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h3
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h2
16 files changed, 209 insertions, 163 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index c3c023f..4f0881f 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -213,7 +213,6 @@ GL_APICALL void* GL_APIENTRY glMapBufferSubDataCHROMIUM (GLuint target, G
GL_APICALL void GL_APIENTRY glUnmapBufferSubDataCHROMIUM (const void* mem);
GL_APICALL void* GL_APIENTRY glMapTexSubImage2DCHROMIUM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access);
GL_APICALL void GL_APIENTRY glUnmapTexSubImage2DCHROMIUM (const void* mem);
-GL_APICALL void GL_APIENTRY glCopyTextureToParentTextureCHROMIUM (GLidBindTexture client_child_id, GLidBindTexture client_parent_id);
GL_APICALL void GL_APIENTRY glResizeCHROMIUM (GLuint width, GLuint height);
GL_APICALL const GLchar* GL_APIENTRY glGetRequestableExtensionsCHROMIUM (void);
GL_APICALL void GL_APIENTRY glRequestExtensionCHROMIUM (const char* extension);
@@ -221,6 +220,9 @@ GL_APICALL void GL_APIENTRY glRateLimitOffscreenContextCHROMIUM (void);
GL_APICALL void GL_APIENTRY glSetSurfaceCHROMIUM (GLint surface_id);
GL_APICALL void GL_APIENTRY glGetMultipleIntegervCHROMIUM (const GLenum* pnames, GLuint count, GLint* results, GLsizeiptr size);
GL_APICALL void GL_APIENTRY glGetProgramInfoCHROMIUM (GLidProgram program, GLsizeiNotNegative bufsize, GLsizei* size, void* info);
+GL_APICALL void GL_APIENTRY glPlaceholder447CHROMIUM (void);
+GL_APICALL void GL_APIENTRY glPlaceholder451CHROMIUM (void);
+GL_APICALL void GL_APIENTRY glPlaceholder452CHROMIUM (void);
"""
# This is the list of all commmands that will be generated and their Id.
@@ -420,10 +422,12 @@ _CMD_ID_TABLE = {
'CompressedTexSubImage2DBucket': 444,
'RenderbufferStorageMultisampleEXT': 445,
'BlitFramebufferEXT': 446,
- 'CopyTextureToParentTextureCHROMIUM': 447,
+ 'Placeholder447CHROMIUM': 447,
'ResizeCHROMIUM': 448,
'GetRequestableExtensionsCHROMIUM': 449,
'RequestExtensionCHROMIUM': 450,
+ 'Placeholder451CHROMIUM': 451,
+ 'Placeholder452CHROMIUM': 452,
'SetSurfaceCHROMIUM': 453,
'GetMultipleIntegervCHROMIUM': 454,
'GetProgramInfoCHROMIUM': 455,
@@ -1722,13 +1726,6 @@ _FUNCTION_INFO = {
'cmd_args': 'GLuint indx, GLint size, GLenum type, GLboolean normalized, '
'GLsizei stride, GLuint offset',
},
- 'CopyTextureToParentTextureCHROMIUM': {
- 'impl_func': False,
- 'decoder_func': 'DoCopyTextureToParentTextureCHROMIUM',
- 'unit_test': False,
- 'extension': True,
- 'chromium': True,
- },
'ResizeCHROMIUM': {
'decoder_func': 'DoResizeCHROMIUM',
'unit_test': False,
@@ -1756,6 +1753,15 @@ _FUNCTION_INFO = {
'extension': True,
'chromium': True,
},
+ 'Placeholder447CHROMIUM': {
+ 'type': 'UnknownCommand',
+ },
+ 'Placeholder451CHROMIUM': {
+ 'type': 'UnknownCommand',
+ },
+ 'Placeholder452CHROMIUM': {
+ 'type': 'UnknownCommand',
+ },
}
@@ -2281,6 +2287,18 @@ TEST_F(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
func.MakeTypedOriginalArgString("")))
file.Write("\n")
+ def WriteGLES2CLibImplementation(self, func, file):
+ file.Write("%s GLES2%s(%s) {\n" %
+ (func.return_type, func.name,
+ func.MakeTypedOriginalArgString("")))
+ result_string = "return "
+ if func.return_type == "void":
+ result_string = ""
+ file.Write(" %sgles2::GetGLContext()->%s(%s);\n" %
+ (result_string, func.original_name,
+ func.MakeOriginalArgString("")))
+ file.Write("}\n")
+
def WriteClientGLCallLog(self, func, file):
"""Writes a logging macro for the client side code."""
comma = ""
@@ -4308,6 +4326,40 @@ TEST_F(%(test_name)s, %(name)sInvalidArgs) {
"""Overrriden from TypeHandler."""
pass
+class UnknownCommandHandler(TypeHandler):
+ """Handler for commands that always fail with kUnknownCommand."""
+
+ def __init__(self):
+ TypeHandler.__init__(self)
+
+ def AddImmediateFunction(self, generator, func):
+ """Overrriden from TypeHandler."""
+ pass
+
+ def WriteServiceImplementation(self, func, file):
+ """Overrriden from TypeHandler."""
+ file.Write(
+ "error::Error GLES2DecoderImpl::Handle%s(\n" % func.name)
+ file.Write(
+ " uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
+ file.Write(" return error::kUnknownCommand;\n")
+ file.Write("}\n")
+
+ def WriteGLES2ImplementationHeader(self, func, file):
+ """Overrriden from TypeHandler."""
+ pass
+
+ def WriteCmdHelper(self, func, file):
+ """Overrriden from TypeHandler."""
+ pass
+
+ def WriteGLES2CLibImplementation(self, func, file):
+ """Overrriden from TypeHandler."""
+ pass;
+
+ def WriteServiceUnitTest(self, func, file):
+ """Overrriden from TypeHandler."""
+ pass;
class FunctionInfo(object):
"""Holds info about a function."""
@@ -5075,6 +5127,10 @@ class Function(object):
"""Writes the service implementation for a command."""
self.type_handler.WriteServiceUnitTest(self, file)
+ def WriteGLES2CLibImplementation(self, file):
+ """Writes the GLES2 C Lib Implemention."""
+ self.type_handler.WriteGLES2CLibImplementation(self, file)
+
def WriteGLES2ImplementationHeader(self, file):
"""Writes the GLES2 Implemention declaration."""
self.type_handler.WriteGLES2ImplementationHeader(self, file)
@@ -5303,6 +5359,7 @@ class GLGenerator(object):
'PUTXn': PUTXnHandler(),
'STRn': STRnHandler(),
'Todo': TodoHandler(),
+ 'UnknownCommand': UnknownCommandHandler(),
}
for func_name in _FUNCTION_INFO:
@@ -5569,17 +5626,7 @@ class GLGenerator(object):
"// These functions emluate GLES2 over command buffers.\n")
for func in self.original_functions:
- file.Write("%s GLES2%s(%s) {\n" %
- (func.return_type, func.name,
- func.MakeTypedOriginalArgString("")))
- result_string = "return "
- if func.return_type == "void":
- result_string = ""
- file.Write(" %sgles2::GetGLContext()->%s(%s);\n" %
- (result_string, func.original_name,
- func.MakeOriginalArgString("")))
- file.Write("}\n")
-
+ func.WriteGLES2CLibImplementation(file)
file.Write("\n")
file.Close()
diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h
index 3585cab..fdd781e 100644
--- a/gpu/command_buffer/client/gles2_c_lib_autogen.h
+++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h
@@ -554,11 +554,6 @@ void* GLES2MapTexSubImage2DCHROMIUM(
void GLES2UnmapTexSubImage2DCHROMIUM(const void* mem) {
gles2::GetGLContext()->UnmapTexSubImage2DCHROMIUM(mem);
}
-void GLES2CopyTextureToParentTextureCHROMIUM(
- GLuint client_child_id, GLuint client_parent_id) {
- gles2::GetGLContext()->CopyTextureToParentTextureCHROMIUM(
- client_child_id, client_parent_id);
-}
void GLES2ResizeCHROMIUM(GLuint width, GLuint height) {
gles2::GetGLContext()->ResizeCHROMIUM(width, height);
}
diff --git a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
index c28e989..010443c 100644
--- a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
+++ b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h
@@ -1195,13 +1195,6 @@
c.Init(bucket_id, result_shm_id, result_shm_offset);
}
- void CopyTextureToParentTextureCHROMIUM(
- GLuint client_child_id, GLuint client_parent_id) {
- gles2::CopyTextureToParentTextureCHROMIUM& c =
- GetCmdSpace<gles2::CopyTextureToParentTextureCHROMIUM>();
- c.Init(client_child_id, client_parent_id);
- }
-
void ResizeCHROMIUM(GLuint width, GLuint height) {
gles2::ResizeCHROMIUM& c = GetCmdSpace<gles2::ResizeCHROMIUM>();
c.Init(width, height);
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index 06108d4..0c052ce 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -847,15 +847,6 @@ void GLES2Implementation::SwapBuffers() {
}
}
-void GLES2Implementation::CopyTextureToParentTextureCHROMIUM(
- GLuint client_child_id, GLuint client_parent_id) {
- GPU_CLIENT_LOG("[" << this << "] glCopyTextureToParentTextureCHROMIUM("
- << client_child_id << ", "
- << client_parent_id << ")");
- helper_->CopyTextureToParentTextureCHROMIUM(client_child_id,
- client_parent_id);
-}
-
void GLES2Implementation::GenSharedIdsCHROMIUM(
GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids) {
GPU_CLIENT_LOG("[" << this << "] glGenSharedIdsCHROMIUMTextures("
diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h
index 245b726..f0c5c4d 100644
--- a/gpu/command_buffer/client/gles2_implementation_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_autogen.h
@@ -1266,9 +1266,6 @@ void* MapTexSubImage2DCHROMIUM(
void UnmapTexSubImage2DCHROMIUM(const void* mem);
-void CopyTextureToParentTextureCHROMIUM(
- GLuint client_child_id, GLuint client_parent_id);
-
void ResizeCHROMIUM(GLuint width, GLuint height) {
GPU_CLIENT_LOG("[" << this << "] glResizeCHROMIUM(" << width << ", " << height << ")"); // NOLINT
helper_->ResizeCHROMIUM(width, height);
diff --git a/gpu/command_buffer/common/gles2_cmd_format_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
index b9d6c06..bddd5b7 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
@@ -8767,46 +8767,6 @@ COMPILE_ASSERT(offsetof(CommandBufferEnableCHROMIUM, result_shm_id) == 8,
COMPILE_ASSERT(offsetof(CommandBufferEnableCHROMIUM, result_shm_offset) == 12,
OffsetOf_CommandBufferEnableCHROMIUM_result_shm_offset_not_12);
-struct CopyTextureToParentTextureCHROMIUM {
- typedef CopyTextureToParentTextureCHROMIUM ValueType;
- static const CommandId kCmdId = kCopyTextureToParentTextureCHROMIUM;
- static const cmd::ArgFlags kArgFlags = cmd::kFixed;
-
- static uint32 ComputeSize() {
- return static_cast<uint32>(sizeof(ValueType)); // NOLINT
- }
-
- void SetHeader() {
- header.SetCmd<ValueType>();
- }
-
- void Init(GLuint _client_child_id, GLuint _client_parent_id) {
- SetHeader();
- client_child_id = _client_child_id;
- client_parent_id = _client_parent_id;
- }
-
- void* Set(void* cmd, GLuint _client_child_id, GLuint _client_parent_id) {
- static_cast<ValueType*>(cmd)->Init(_client_child_id, _client_parent_id);
- return NextCmdAddress<ValueType>(cmd);
- }
-
- gpu::CommandHeader header;
- uint32 client_child_id;
- uint32 client_parent_id;
-};
-
-COMPILE_ASSERT(sizeof(CopyTextureToParentTextureCHROMIUM) == 12,
- Sizeof_CopyTextureToParentTextureCHROMIUM_is_not_12);
-COMPILE_ASSERT(offsetof(CopyTextureToParentTextureCHROMIUM, header) == 0,
- OffsetOf_CopyTextureToParentTextureCHROMIUM_header_not_0);
-COMPILE_ASSERT(
- offsetof(CopyTextureToParentTextureCHROMIUM, client_child_id) == 4,
- OffsetOf_CopyTextureToParentTextureCHROMIUM_client_child_id_not_4); // NOLINT
-COMPILE_ASSERT(
- offsetof(CopyTextureToParentTextureCHROMIUM, client_parent_id) == 8,
- OffsetOf_CopyTextureToParentTextureCHROMIUM_client_parent_id_not_8); // NOLINT
-
struct ResizeCHROMIUM {
typedef ResizeCHROMIUM ValueType;
static const CommandId kCmdId = kResizeCHROMIUM;
@@ -9059,6 +9019,96 @@ COMPILE_ASSERT(offsetof(GetProgramInfoCHROMIUM::Result, num_attribs) == 4,
COMPILE_ASSERT(offsetof(GetProgramInfoCHROMIUM::Result, num_uniforms) == 8,
OffsetOf_GetProgramInfoCHROMIUM_Result_num_uniforms_not_8);
+struct Placeholder447CHROMIUM {
+ typedef Placeholder447CHROMIUM ValueType;
+ static const CommandId kCmdId = kPlaceholder447CHROMIUM;
+ static const cmd::ArgFlags kArgFlags = cmd::kFixed;
+
+ static uint32 ComputeSize() {
+ return static_cast<uint32>(sizeof(ValueType)); // NOLINT
+ }
+
+ void SetHeader() {
+ header.SetCmd<ValueType>();
+ }
+
+ void Init() {
+ SetHeader();
+ }
+
+ void* Set(void* cmd) {
+ static_cast<ValueType*>(cmd)->Init();
+ return NextCmdAddress<ValueType>(cmd);
+ }
+
+ gpu::CommandHeader header;
+};
+
+COMPILE_ASSERT(sizeof(Placeholder447CHROMIUM) == 4,
+ Sizeof_Placeholder447CHROMIUM_is_not_4);
+COMPILE_ASSERT(offsetof(Placeholder447CHROMIUM, header) == 0,
+ OffsetOf_Placeholder447CHROMIUM_header_not_0);
+
+struct Placeholder451CHROMIUM {
+ typedef Placeholder451CHROMIUM ValueType;
+ static const CommandId kCmdId = kPlaceholder451CHROMIUM;
+ static const cmd::ArgFlags kArgFlags = cmd::kFixed;
+
+ static uint32 ComputeSize() {
+ return static_cast<uint32>(sizeof(ValueType)); // NOLINT
+ }
+
+ void SetHeader() {
+ header.SetCmd<ValueType>();
+ }
+
+ void Init() {
+ SetHeader();
+ }
+
+ void* Set(void* cmd) {
+ static_cast<ValueType*>(cmd)->Init();
+ return NextCmdAddress<ValueType>(cmd);
+ }
+
+ gpu::CommandHeader header;
+};
+
+COMPILE_ASSERT(sizeof(Placeholder451CHROMIUM) == 4,
+ Sizeof_Placeholder451CHROMIUM_is_not_4);
+COMPILE_ASSERT(offsetof(Placeholder451CHROMIUM, header) == 0,
+ OffsetOf_Placeholder451CHROMIUM_header_not_0);
+
+struct Placeholder452CHROMIUM {
+ typedef Placeholder452CHROMIUM ValueType;
+ static const CommandId kCmdId = kPlaceholder452CHROMIUM;
+ static const cmd::ArgFlags kArgFlags = cmd::kFixed;
+
+ static uint32 ComputeSize() {
+ return static_cast<uint32>(sizeof(ValueType)); // NOLINT
+ }
+
+ void SetHeader() {
+ header.SetCmd<ValueType>();
+ }
+
+ void Init() {
+ SetHeader();
+ }
+
+ void* Set(void* cmd) {
+ static_cast<ValueType*>(cmd)->Init();
+ return NextCmdAddress<ValueType>(cmd);
+ }
+
+ gpu::CommandHeader header;
+};
+
+COMPILE_ASSERT(sizeof(Placeholder452CHROMIUM) == 4,
+ Sizeof_Placeholder452CHROMIUM_is_not_4);
+COMPILE_ASSERT(offsetof(Placeholder452CHROMIUM, header) == 0,
+ OffsetOf_Placeholder452CHROMIUM_header_not_0);
+
#endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_AUTOGEN_H_
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 61513f5..d4dbf8f 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
@@ -3454,21 +3454,6 @@ TEST(GLES2FormatTest, CommandBufferEnableCHROMIUM) {
EXPECT_EQ(static_cast<uint32>(13), cmd.result_shm_offset);
}
-TEST(GLES2FormatTest, CopyTextureToParentTextureCHROMIUM) {
- CopyTextureToParentTextureCHROMIUM cmd = { { 0 } };
- void* next_cmd = cmd.Set(
- &cmd,
- static_cast<GLuint>(11),
- static_cast<GLuint>(12));
- EXPECT_EQ(static_cast<uint32>(CopyTextureToParentTextureCHROMIUM::kCmdId),
- cmd.header.command);
- EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
- EXPECT_EQ(static_cast<char*>(next_cmd),
- reinterpret_cast<char*>(&cmd) + sizeof(cmd));
- EXPECT_EQ(static_cast<GLuint>(11), cmd.client_child_id);
- EXPECT_EQ(static_cast<GLuint>(12), cmd.client_parent_id);
-}
-
TEST(GLES2FormatTest, ResizeCHROMIUM) {
ResizeCHROMIUM cmd = { { 0 } };
void* next_cmd = cmd.Set(
@@ -3561,5 +3546,38 @@ TEST(GLES2FormatTest, GetProgramInfoCHROMIUM) {
EXPECT_EQ(static_cast<uint32>(12), cmd.bucket_id);
}
+TEST(GLES2FormatTest, Placeholder447CHROMIUM) {
+ Placeholder447CHROMIUM cmd = { { 0 } };
+ void* next_cmd = cmd.Set(
+ &cmd);
+ EXPECT_EQ(static_cast<uint32>(Placeholder447CHROMIUM::kCmdId),
+ cmd.header.command);
+ EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
+ EXPECT_EQ(static_cast<char*>(next_cmd),
+ reinterpret_cast<char*>(&cmd) + sizeof(cmd));
+}
+
+TEST(GLES2FormatTest, Placeholder451CHROMIUM) {
+ Placeholder451CHROMIUM cmd = { { 0 } };
+ void* next_cmd = cmd.Set(
+ &cmd);
+ EXPECT_EQ(static_cast<uint32>(Placeholder451CHROMIUM::kCmdId),
+ cmd.header.command);
+ EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
+ EXPECT_EQ(static_cast<char*>(next_cmd),
+ reinterpret_cast<char*>(&cmd) + sizeof(cmd));
+}
+
+TEST(GLES2FormatTest, Placeholder452CHROMIUM) {
+ Placeholder452CHROMIUM cmd = { { 0 } };
+ void* next_cmd = cmd.Set(
+ &cmd);
+ EXPECT_EQ(static_cast<uint32>(Placeholder452CHROMIUM::kCmdId),
+ cmd.header.command);
+ EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
+ EXPECT_EQ(static_cast<char*>(next_cmd),
+ reinterpret_cast<char*>(&cmd) + sizeof(cmd));
+}
+
#endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_TEST_AUTOGEN_H_
diff --git a/gpu/command_buffer/common/gles2_cmd_id_test_autogen.h b/gpu/command_buffer/common/gles2_cmd_id_test_autogen.h
index 9015908..ff99a65 100644
--- a/gpu/command_buffer/common/gles2_cmd_id_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_id_test_autogen.h
@@ -393,10 +393,6 @@ TEST(GLES2CommandIdTest, CommandIdsMatch) {
GLES2_RegisterSharedIdsCHROMIUM_kCmdId_mismatch);
COMPILE_ASSERT(CommandBufferEnableCHROMIUM::kCmdId == 442,
GLES2_CommandBufferEnableCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(CopyTextureToParentTextureCHROMIUM::kCmdId == 447,
- GLES2_CopyTextureToParentTextureCHROMIUM_kCmdId_mismatch);
- COMPILE_ASSERT(ResizeCHROMIUM::kCmdId == 448,
- GLES2_ResizeCHROMIUM_kCmdId_mismatch);
}
#endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_ID_TEST_AUTOGEN_H_
diff --git a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
index e164a51..14cb3e4 100644
--- a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
@@ -201,10 +201,12 @@
OP(CompressedTexSubImage2DBucket) /* 444 */ \
OP(RenderbufferStorageMultisampleEXT) /* 445 */ \
OP(BlitFramebufferEXT) /* 446 */ \
- OP(CopyTextureToParentTextureCHROMIUM) /* 447 */ \
+ OP(Placeholder447CHROMIUM) /* 447 */ \
OP(ResizeCHROMIUM) /* 448 */ \
OP(GetRequestableExtensionsCHROMIUM) /* 449 */ \
OP(RequestExtensionCHROMIUM) /* 450 */ \
+ OP(Placeholder451CHROMIUM) /* 451 */ \
+ OP(Placeholder452CHROMIUM) /* 452 */ \
OP(SetSurfaceCHROMIUM) /* 453 */ \
OP(GetMultipleIntegervCHROMIUM) /* 454 */ \
OP(GetProgramInfoCHROMIUM) /* 455 */ \
diff --git a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
index 953875c..e8a1798 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h
@@ -179,7 +179,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
{ 0x00000400, "GL_STENCIL_BUFFER_BIT", },
{ 0x800A, "GL_FUNC_SUBTRACT", },
{ 0x8E2C, "GL_DEPTH_COMPONENT16_NONLINEAR_NV", },
- { 0x889F, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", },
+ { 0x8508, "GL_DECR_WRAP", },
{ 0x8006, "GL_FUNC_ADD", },
{ 0x8007, "GL_MIN_EXT", },
{ 0x8004, "GL_ONE_MINUS_CONSTANT_ALPHA", },
@@ -406,7 +406,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = {
{ 0x80CA, "GL_BLEND_DST_ALPHA", },
{ 0x8CD6, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT", },
{ 0x8872, "GL_MAX_TEXTURE_IMAGE_UNITS", },
- { 0x8508, "GL_DECR_WRAP", },
+ { 0x889F, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", },
{ 0x8507, "GL_INCR_WRAP", },
{ 0x8895, "GL_ELEMENT_ARRAY_BUFFER_BINDING", },
{ 0x8894, "GL_ARRAY_BUFFER_BINDING", },
diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc
index 21e4550..cde093d 100644
--- a/gpu/command_buffer/service/feature_info.cc
+++ b/gpu/command_buffer/service/feature_info.cc
@@ -102,7 +102,6 @@ void FeatureInfo::AddFeatures(const char* desired_features) {
bool npot_ok = false;
- AddExtensionString("GL_CHROMIUM_copy_texture_to_parent_texture");
AddExtensionString("GL_CHROMIUM_resource_safe");
AddExtensionString("GL_CHROMIUM_resize");
AddExtensionString("GL_CHROMIUM_strict_attribs");
diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc
index 95b47e0..d9cd34e 100644
--- a/gpu/command_buffer/service/feature_info_unittest.cc
+++ b/gpu/command_buffer/service/feature_info_unittest.cc
@@ -67,8 +67,6 @@ TEST_F(FeatureInfoTest, InitializeNoExtensions) {
SetupInitExpectations("");
info_.Initialize(NULL);
// Check default extensions are there
- EXPECT_THAT(info_.extensions(),
- HasSubstr("GL_CHROMIUM_copy_texture_to_parent_texture"));
EXPECT_THAT(info_.extensions(), HasSubstr("GL_CHROMIUM_resource_safe"));
EXPECT_THAT(info_.extensions(), HasSubstr("GL_CHROMIUM_strict_attribs"));
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index b7477c5..20e2b11 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -1036,9 +1036,6 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
// Wrapper for glValidateProgram.
void DoValidateProgram(GLuint program_client_id);
- void DoCopyTextureToParentTextureCHROMIUM(
- GLuint client_texture_id, GLuint parent_client_texture_id);
-
void DoResizeCHROMIUM(GLuint width, GLuint height);
void DoSetSurfaceCHROMIUM(GLint surface_id);
@@ -1285,8 +1282,6 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
GLenum offscreen_target_stencil_format_;
GLsizei offscreen_target_samples_;
- GLuint copy_texture_to_parent_texture_fb_;
-
// The copy that is saved when SwapBuffers is called.
scoped_ptr<FrameBuffer> offscreen_saved_frame_buffer_;
scoped_ptr<Texture> offscreen_saved_color_texture_;
@@ -1680,7 +1675,6 @@ GLES2DecoderImpl::GLES2DecoderImpl(SurfaceManager* surface_manager,
offscreen_target_depth_format_(0),
offscreen_target_stencil_format_(0),
offscreen_target_samples_(0),
- copy_texture_to_parent_texture_fb_(0),
offscreen_saved_color_format_(0),
back_buffer_color_format_(0),
back_buffer_has_depth_(false),
@@ -1934,8 +1928,6 @@ bool GLES2DecoderImpl::Initialize(
// Bind to the new default frame buffer (the offscreen target frame buffer).
// This should now be associated with ID zero.
DoBindFramebuffer(GL_FRAMEBUFFER, 0);
-
- glGenFramebuffersEXT(1, &copy_texture_to_parent_texture_fb_);
}
// OpenGL ES 2.0 implicitly enables the desktop GL capability
@@ -2456,9 +2448,6 @@ void GLES2DecoderImpl::Destroy() {
glDeleteBuffersARB(1, &fixed_attrib_buffer_id_);
}
- if (copy_texture_to_parent_texture_fb_)
- glDeleteFramebuffersEXT(1, &copy_texture_to_parent_texture_fb_);
-
if (offscreen_target_frame_buffer_.get())
offscreen_target_frame_buffer_->Destroy();
if (offscreen_target_color_texture_.get())
@@ -2572,37 +2561,6 @@ void GLES2DecoderImpl::ResizeOffscreenFrameBuffer(const gfx::Size& size) {
pending_offscreen_size_ = size;
}
-void GLES2DecoderImpl::DoCopyTextureToParentTextureCHROMIUM(
- GLuint client_texture_id,
- GLuint parent_client_texture_id) {
- if (parent_) {
- TextureManager::TextureInfo* texture = texture_manager()->GetTextureInfo(
- client_texture_id);
- TextureManager::TextureInfo* parent_texture =
- parent_->texture_manager()->GetTextureInfo(parent_client_texture_id);
- if (!texture || !parent_texture) {
- current_decoder_error_ = error::kInvalidArguments;
- return;
- }
- ScopedFrameBufferBinder fb_binder(this, copy_texture_to_parent_texture_fb_);
- glFramebufferTexture2DEXT(GL_FRAMEBUFFER,
- GL_COLOR_ATTACHMENT0,
- GL_TEXTURE_2D,
- texture->service_id(),
- 0);
- ScopedTexture2DBinder tex_binder(this, parent_texture->service_id());
- GLsizei width, height;
- parent_texture->GetLevelSize(GL_TEXTURE_2D, 0, &width, &height);
- glCopyTexImage2D(GL_TEXTURE_2D,
- 0, // level
- GL_RGBA,
- 0, 0, // x, y
- width,
- height,
- 0); // border
- }
-}
-
void GLES2DecoderImpl::DoResizeCHROMIUM(GLuint width, GLuint height) {
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(TOUCH_UI)
// Make sure that we are done drawing to the back buffer before resizing.
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
index 6136849..9023cfe 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
@@ -2568,15 +2568,6 @@ error::Error GLES2DecoderImpl::HandleGetMaxValueInBufferCHROMIUM(
return error::kNoError;
}
-error::Error GLES2DecoderImpl::HandleCopyTextureToParentTextureCHROMIUM(
- uint32 immediate_data_size,
- const gles2::CopyTextureToParentTextureCHROMIUM& c) {
- GLuint client_child_id = c.client_child_id;
- GLuint client_parent_id = c.client_parent_id;
- DoCopyTextureToParentTextureCHROMIUM(client_child_id, client_parent_id);
- return error::kNoError;
-}
-
error::Error GLES2DecoderImpl::HandleResizeCHROMIUM(
uint32 immediate_data_size, const gles2::ResizeCHROMIUM& c) {
GLuint width = static_cast<GLuint>(c.width);
@@ -2592,5 +2583,17 @@ error::Error GLES2DecoderImpl::HandleSetSurfaceCHROMIUM(
return error::kNoError;
}
+error::Error GLES2DecoderImpl::HandlePlaceholder447CHROMIUM(
+ uint32 immediate_data_size, const gles2::Placeholder447CHROMIUM& c) {
+ return error::kUnknownCommand;
+}
+error::Error GLES2DecoderImpl::HandlePlaceholder451CHROMIUM(
+ uint32 immediate_data_size, const gles2::Placeholder451CHROMIUM& c) {
+ return error::kUnknownCommand;
+}
+error::Error GLES2DecoderImpl::HandlePlaceholder452CHROMIUM(
+ uint32 immediate_data_size, const gles2::Placeholder452CHROMIUM& c) {
+ return error::kUnknownCommand;
+}
#endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_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 05f80a3..ff07f42 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
@@ -1706,12 +1706,13 @@ TEST_F(GLES2DecoderTest2, ViewportInvalidArgs3_0) {
// TODO(gman): CommandBufferEnableCHROMIUM
-// TODO(gman): CopyTextureToParentTextureCHROMIUM
// TODO(gman): ResizeCHROMIUM
// TODO(gman): GetRequestableExtensionsCHROMIUM
// TODO(gman): RequestExtensionCHROMIUM
// TODO(gman): SetSurfaceCHROMIUM
+// TODO(gman): GetMultipleIntegervCHROMIUM
+
#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 cab6b33..80f5bc3 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,8 +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): GetMultipleIntegervCHROMIUM
-
// TODO(gman): GetProgramInfoCHROMIUM
#endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_3_AUTOGEN_H_