diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-03 10:58:34 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-03 10:58:34 +0100 |
| commit | cedac228d2dd51db4b79ea1e72c7f249408ee061 (patch) | |
| tree | aa4ff43d7fe316e95d12721ce5e17653a768a0dd /gpu | |
| parent | 6a869ecff032b5bed299d661b078b0555034598b (diff) | |
| download | chromium_org-cedac228d2dd51db4b79ea1e72c7f249408ee061.tar.gz | |
Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
Diffstat (limited to 'gpu')
188 files changed, 4649 insertions, 5907 deletions
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn new file mode 100644 index 0000000000..b810a8a8ab --- /dev/null +++ b/gpu/BUILD.gn @@ -0,0 +1,133 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# GYP-to-GN project mappings: +# +# gpu.gyp:command_buffer_client => //gpu/command_buffer/client +# +# gpu.gyp:command_buffer_common => //gpu/command_buffer/common +# +# gpu.gyp:gles2_cmd_helper => //gpu/command_buffer/client:gles2_cmd_helper +# +# gpu.gyp:gles2_c_lib => //gpu/command_buffer/client:gles2_c_lib +# +# gpu.gyp:gles2_implementation => +# //gpu/command_buffer/client:gles2_implementation + +# gpu.gyp:gles2_implementation_client_side_arrays => +# //gpu/command_buffer/client:gles2_implementation_client_side_arrays +# +# gpu.gyp:gpu_config => //gpu/config +# +# gpu.gyp:gpu_ipc => //gpu/ipc +# +# gpu.gyp:disk_cache_proto => //gpu/command_buffer/service:disk_cache_proto +# +# command_buffer/command_buffer.gyp:gles2_utils => +# //gpu/command_buffer/common +# (Merged in to here because the separate file exists in GYP only to break +# a .gyp file dependency cycle which GN doesn't have.) + +component("gpu") { + deps = [ + "//gpu/command_buffer/client", + "//gpu/command_buffer/common", + "//gpu/command_buffer/service", + "//gpu/command_buffer/client:gles2_cmd_helper", + "//gpu/config", + "//gpu/ipc", + ] +} + +source_set("gpu_unittest_utils") { + sources = [ + "command_buffer/service/gles2_cmd_decoder_mock.cc", + "command_buffer/service/error_state_mock.cc", + "command_buffer/client/gles2_interface_stub.cc", + "command_buffer/client/gles2_interface_stub.h", + ] + + configs += [ "//third_party/khronos:khronos_headers" ] + + deps = [ + ":gpu", + "//testing/gmock", + "//testing/gtest", + "//ui/gl:gl_unittest_utils", + ] +} + +# TODO(GYP) This doesn't link yet. +if (false) { +test("gl_tests") { + sources = [ + "command_buffer/tests/compressed_texture_test.cc", + "command_buffer/tests/gl_bind_uniform_location_unittest.cc", + "command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc", + "command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc", + "command_buffer/tests/gl_depth_texture_unittest.cc", + "command_buffer/tests/gl_gpu_memory_buffer_unittest.cc", + "command_buffer/tests/gl_lose_context_chromium_unittest.cc", + "command_buffer/tests/gl_manager.cc", + "command_buffer/tests/gl_manager.h", + "command_buffer/tests/gl_pointcoord_unittest.cc", + "command_buffer/tests/gl_program_unittest.cc", + "command_buffer/tests/gl_query_unittest.cc", + "command_buffer/tests/gl_readback_unittest.cc", + "command_buffer/tests/gl_shared_resources_unittest.cc", + "command_buffer/tests/gl_stream_draw_unittest.cc", + "command_buffer/tests/gl_test_utils.cc", + "command_buffer/tests/gl_test_utils.h", + "command_buffer/tests/gl_tests_main.cc", + "command_buffer/tests/gl_texture_mailbox_unittest.cc", + "command_buffer/tests/gl_texture_storage_unittest.cc", + "command_buffer/tests/gl_unittest.cc", + "command_buffer/tests/gl_unittests_android.cc", + "command_buffer/tests/gl_virtual_contexts_unittest.cc", + "command_buffer/tests/occlusion_query_unittest.cc", + ] + + defines = [ + "GLES2_C_LIB_IMPLEMENTATION", + "GL_GLEXT_PROTOTYPES", + ] + + deps = [ + ":gpu", + ":gpu_unittest_utils", + "//base", + "//base/third_party/dynamic_annotations", + "//testing/gmock", + "//testing/gtest", + # TODO(GYP) + #"<(angle_path)/src/build_angle.gyp:translator", + "//ui/gfx", + "//ui/gfx/geometry", + "//ui/gl", + #"//gpu/command_buffer/client", # These are all part of //gpu, needed? + #"//gpu/command_buffer/common", + #"//gpu/command_buffer/service", + #"//gpu/command_buffer/client:gles2_cmd_helper", + "//gpu/command_buffer/client:gles2_c_lib", + "//gpu/command_buffer/client:gles2_implementation_client_side_arrays", + ] + + # TODO(GYP) + # ['OS == "android"', { + # 'dependencies': [ + # '../testing/android/native_test.gyp:native_test_native_code', + # ], + # }], + # ['OS == "win"', { + # 'dependencies': [ + # '../third_party/angle/src/build_angle.gyp:libEGL', + # '../third_party/angle/src/build_angle.gyp:libGLESv2', + # ], + # }], +} +} # if (false) + +# TODO(GYP) +# gl_tests_apk +# gpu_unittests_apk diff --git a/gpu/command_buffer/OWNERS b/gpu/command_buffer/OWNERS index bb8ea76f76..cd07f4dafa 100644 --- a/gpu/command_buffer/OWNERS +++ b/gpu/command_buffer/OWNERS @@ -2,3 +2,4 @@ piman@chromium.org jbauman@chromium.org bajones@chromium.org zmo@chromium.org +vmiura@chromium.org diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index ca03986531..23a9b2bdf5 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -507,9 +507,16 @@ _STATES = { }, } -# This is a list of enum names and their valid values. It is used to map -# GLenum arguments to a specific set of valid values. -_ENUM_LISTS = { +# Named type info object represents a named type that is used in OpenGL call +# arguments. Each named type defines a set of valid OpenGL call arguments. The +# named types are used in 'cmd_buffer_functions.txt'. +# type: The actual GL type of the named type. +# valid: The list of values that are valid for both the client and the service. +# invalid: Examples of invalid values for the type. At least these values +# should be tested to be invalid. +# is_complete: The list of valid values of type are final and will not be +# modified during runtime. +_NAMED_TYPE_INFO = { 'BlitFilter': { 'type': 'GLenum', 'valid': [ @@ -1152,6 +1159,7 @@ _ENUM_LISTS = { }, 'TextureBorder': { 'type': 'GLint', + 'is_complete': True, 'valid': [ '0', ], @@ -1174,6 +1182,7 @@ _ENUM_LISTS = { }, 'ZeroOnly': { 'type': 'GLint', + 'is_complete': True, 'valid': [ '0', ], @@ -1183,6 +1192,7 @@ _ENUM_LISTS = { }, 'FalseOnly': { 'type': 'GLboolean', + 'is_complete': True, 'valid': [ 'false', ], @@ -1213,8 +1223,11 @@ _PEPPER_INTERFACES = [ {'name': 'DrawBuffers', 'dev': True}, ] -# This table specifies types and other special data for the commands that -# will be generated. +# A function info object specifies the type and other special data for the +# command that will be generated. A base function info object is generated by +# parsing the "cmd_buffer_functions.txt", one for each function in the +# file. These function info objects can be augmented and their values can be +# overridden by adding an object to the table below. # # Must match function names specified in "cmd_buffer_functions.txt". # @@ -1238,7 +1251,6 @@ _PEPPER_INTERFACES = [ # impl_decl: Whether or not to generate the GLES2Implementation declaration # for this command. # needs_size: If true a data_size field is added to the command. -# data_type: The type of data the command uses. For PUTn or PUT types. # count: The number of units per element. For PUTn or PUT types. # unit_test: If False no service side unit test will be generated. # client_test: If False no client side unit test will be generated. @@ -1262,6 +1274,11 @@ _PEPPER_INTERFACES = [ # first_element_only: For PUT types, True if only the first element of an # array is used and we end up calling the single value # corresponding function. eg. TexParameteriv -> TexParameteri +# extension: Function is an extension to GL and should not be exposed to +# pepper unless pepper_interface is defined. +# extension_flag: Function is an extension and should be enabled only when +# the corresponding feature info flag is enabled. Implies +# 'extension': True. _FUNCTION_INFO = { 'ActiveTexture': { @@ -1306,7 +1323,7 @@ _FUNCTION_INFO = { 'BlitFramebufferCHROMIUM': { 'decoder_func': 'DoBlitFramebufferCHROMIUM', 'unit_test': False, - 'extension': True, + 'extension_flag': 'chromium_framebuffer_multisample', 'pepper_interface': 'FramebufferBlit', 'pepper_name': 'BlitFramebufferEXT', 'defer_reads': True, @@ -1359,7 +1376,6 @@ _FUNCTION_INFO = { 'decoder_func': 'DoConsumeTextureCHROMIUM', 'impl_func': False, 'type': 'PUT', - 'data_type': 'GLbyte', 'count': 64, # GL_MAILBOX_SIZE_CHROMIUM 'unit_test': False, 'client_test': False, @@ -1606,7 +1622,7 @@ _FUNCTION_INFO = { 'gl_test_func': 'glFramebufferTexture2DMultisampleEXT', 'expectation': False, 'unit_test': False, - 'extension': True, + 'extension_flag': 'multisampled_render_to_texture', 'trace_level': 1, }, 'GenerateMipmap': { @@ -1953,7 +1969,6 @@ _FUNCTION_INFO = { 'decoder_func': 'DoProduceTextureCHROMIUM', 'impl_func': False, 'type': 'PUT', - 'data_type': 'GLbyte', 'count': 64, # GL_MAILBOX_SIZE_CHROMIUM 'unit_test': False, 'client_test': False, @@ -1973,7 +1988,7 @@ _FUNCTION_INFO = { 'gl_test_func': 'glRenderbufferStorageMultisampleCHROMIUM', 'expectation': False, 'unit_test': False, - 'extension': True, + 'extension_flag': 'chromium_framebuffer_multisample', 'pepper_interface': 'FramebufferMultisample', 'pepper_name': 'RenderbufferStorageMultisampleEXT', }, @@ -1984,7 +1999,7 @@ _FUNCTION_INFO = { 'gl_test_func': 'glRenderbufferStorageMultisampleEXT', 'expectation': False, 'unit_test': False, - 'extension': True, + 'extension_flag': 'multisampled_render_to_texture', }, 'ReadPixels': { 'cmd_comment': @@ -2071,7 +2086,6 @@ _FUNCTION_INFO = { }, 'TexParameterfv': { 'type': 'PUT', - 'data_type': 'GLfloat', 'data_value': 'GL_NEAREST', 'count': 1, 'decoder_func': 'DoTexParameterfv', @@ -2080,7 +2094,6 @@ _FUNCTION_INFO = { }, 'TexParameteriv': { 'type': 'PUT', - 'data_type': 'GLint', 'data_value': 'GL_NEAREST', 'count': 1, 'decoder_func': 'DoTexParameteriv', @@ -2097,78 +2110,67 @@ _FUNCTION_INFO = { 'GLenumTextureFormat format, GLenumPixelType type, ' 'const void* pixels, GLboolean internal' }, - 'Uniform1f': {'type': 'PUTXn', 'data_type': 'GLfloat', 'count': 1}, + 'Uniform1f': {'type': 'PUTXn', 'count': 1}, 'Uniform1fv': { 'type': 'PUTn', - 'data_type': 'GLfloat', 'count': 1, 'decoder_func': 'DoUniform1fv', }, 'Uniform1i': {'decoder_func': 'DoUniform1i', 'unit_test': False}, 'Uniform1iv': { 'type': 'PUTn', - 'data_type': 'GLint', 'count': 1, 'decoder_func': 'DoUniform1iv', 'unit_test': False, }, - 'Uniform2i': {'type': 'PUTXn', 'data_type': 'GLint', 'count': 2}, - 'Uniform2f': {'type': 'PUTXn', 'data_type': 'GLfloat', 'count': 2}, + 'Uniform2i': {'type': 'PUTXn', 'count': 2}, + 'Uniform2f': {'type': 'PUTXn', 'count': 2}, 'Uniform2fv': { 'type': 'PUTn', - 'data_type': 'GLfloat', 'count': 2, 'decoder_func': 'DoUniform2fv', }, 'Uniform2iv': { 'type': 'PUTn', - 'data_type': 'GLint', 'count': 2, 'decoder_func': 'DoUniform2iv', }, - 'Uniform3i': {'type': 'PUTXn', 'data_type': 'GLint', 'count': 3}, - 'Uniform3f': {'type': 'PUTXn', 'data_type': 'GLfloat', 'count': 3}, + 'Uniform3i': {'type': 'PUTXn', 'count': 3}, + 'Uniform3f': {'type': 'PUTXn', 'count': 3}, 'Uniform3fv': { 'type': 'PUTn', - 'data_type': 'GLfloat', 'count': 3, 'decoder_func': 'DoUniform3fv', }, 'Uniform3iv': { 'type': 'PUTn', - 'data_type': 'GLint', 'count': 3, 'decoder_func': 'DoUniform3iv', }, - 'Uniform4i': {'type': 'PUTXn', 'data_type': 'GLint', 'count': 4}, - 'Uniform4f': {'type': 'PUTXn', 'data_type': 'GLfloat', 'count': 4}, + 'Uniform4i': {'type': 'PUTXn', 'count': 4}, + 'Uniform4f': {'type': 'PUTXn', 'count': 4}, 'Uniform4fv': { 'type': 'PUTn', - 'data_type': 'GLfloat', 'count': 4, 'decoder_func': 'DoUniform4fv', }, 'Uniform4iv': { 'type': 'PUTn', - 'data_type': 'GLint', 'count': 4, 'decoder_func': 'DoUniform4iv', }, 'UniformMatrix2fv': { 'type': 'PUTn', - 'data_type': 'GLfloat', 'count': 4, 'decoder_func': 'DoUniformMatrix2fv', }, 'UniformMatrix3fv': { 'type': 'PUTn', - 'data_type': 'GLfloat', 'count': 9, 'decoder_func': 'DoUniformMatrix3fv', }, 'UniformMatrix4fv': { 'type': 'PUTn', - 'data_type': 'GLfloat', 'count': 16, 'decoder_func': 'DoUniformMatrix4fv', }, @@ -2206,28 +2208,24 @@ _FUNCTION_INFO = { 'VertexAttrib1f': {'decoder_func': 'DoVertexAttrib1f'}, 'VertexAttrib1fv': { 'type': 'PUT', - 'data_type': 'GLfloat', 'count': 1, 'decoder_func': 'DoVertexAttrib1fv', }, 'VertexAttrib2f': {'decoder_func': 'DoVertexAttrib2f'}, 'VertexAttrib2fv': { 'type': 'PUT', - 'data_type': 'GLfloat', 'count': 2, 'decoder_func': 'DoVertexAttrib2fv', }, 'VertexAttrib3f': {'decoder_func': 'DoVertexAttrib3f'}, 'VertexAttrib3fv': { 'type': 'PUT', - 'data_type': 'GLfloat', 'count': 3, 'decoder_func': 'DoVertexAttrib3fv', }, 'VertexAttrib4f': {'decoder_func': 'DoVertexAttrib4f'}, 'VertexAttrib4fv': { 'type': 'PUT', - 'data_type': 'GLfloat', 'count': 4, 'decoder_func': 'DoVertexAttrib4fv', }, @@ -2312,10 +2310,11 @@ _FUNCTION_INFO = { 'DrawBuffersEXT': { 'type': 'PUTn', 'decoder_func': 'DoDrawBuffersEXT', - 'data_type': 'GLenum', 'count': 1, 'client_test': False, 'unit_test': False, + # could use 'extension_flag': 'ext_draw_buffers' but currently expected to + # work without. 'extension': True, 'pepper_interface': 'DrawBuffers', }, @@ -2533,17 +2532,16 @@ _FUNCTION_INFO = { 'DiscardFramebufferEXT': { 'type': 'PUTn', 'count': 1, - 'data_type': 'GLenum', 'cmd_args': 'GLenum target, GLsizei count, ' 'const GLenum* attachments', 'decoder_func': 'DoDiscardFramebufferEXT', 'unit_test': False, 'client_test': False, - 'extension': True, + 'extension_flag': 'ext_discard_framebuffer', }, 'LoseContextCHROMIUM': { - 'type': 'Manual', - 'impl_func': True, + 'decoder_func': 'DoLoseContextCHROMIUM', + 'unit_test': False, 'extension': True, 'chromium': True, }, @@ -2714,6 +2712,7 @@ class TypeHandler(object): if immediate == True or immediate == None: if func.num_pointer_args == 1 or immediate: generator.AddFunction(ImmediateFunction(func)) + return True def AddBucketFunction(self, generator, func): """Adds a bucket version of a function.""" @@ -2752,6 +2751,12 @@ class TypeHandler(object): args = func.GetCmdArgs() for arg in args: file.Write(" %s %s;\n" % (arg.cmd_type, arg.name)) + + consts = func.GetCmdConstants() + for const in consts: + file.Write(" static const %s %s = %s;\n" % + (const.cmd_type, const.name, const.GetConstantValue())) + file.Write("};\n") file.Write("\n") @@ -2850,6 +2855,7 @@ COMPILE_ASSERT(offsetof(%(cmd_name)s::Result, %(field_name)s) == %(offset)d, file.Write( " uint32_t immediate_data_size, const gles2::cmds::%s& c) {\n" % func.name) + self.WriteHandlerExtensionCheck(func, file) self.WriteHandlerDeferReadWrite(func, file); if len(func.GetOriginalArgs()) > 0: last_arg = func.GetLastOriginalArg() @@ -2871,6 +2877,7 @@ COMPILE_ASSERT(offsetof(%(cmd_name)s::Result, %(field_name)s) == %(offset)d, file.Write( " uint32_t immediate_data_size, const gles2::cmds::%s& c) {\n" % func.name) + self.WriteHandlerExtensionCheck(func, file) self.WriteHandlerDeferReadWrite(func, file); last_arg = func.GetLastOriginalArg() all_but_last_arg = func.GetOriginalArgs()[:-1] @@ -2891,6 +2898,7 @@ COMPILE_ASSERT(offsetof(%(cmd_name)s::Result, %(field_name)s) == %(offset)d, file.Write( " uint32_t immediate_data_size, const gles2::cmds::%s& c) {\n" % func.name) + self.WriteHandlerExtensionCheck(func, file) self.WriteHandlerDeferReadWrite(func, file); last_arg = func.GetLastOriginalArg() all_but_last_arg = func.GetOriginalArgs()[:-1] @@ -2904,6 +2912,14 @@ COMPILE_ASSERT(offsetof(%(cmd_name)s::Result, %(field_name)s) == %(offset)d, file.Write("}\n") file.Write("\n") + def WriteHandlerExtensionCheck(self, func, file): + if func.GetInfo('extension_flag'): + file.Write(" if (!features().%s) {\n" % func.GetInfo('extension_flag')) + file.Write(" LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, \"gl%s\"," + " \"function not available\");\n" % func.original_name) + file.Write(" return error::kNoError;") + file.Write(" }\n\n") + def WriteHandlerDeferReadWrite(self, func, file): """Writes the code to handle deferring reads or writes.""" defer_draws = func.GetInfo('defer_draws') @@ -2920,16 +2936,18 @@ COMPILE_ASSERT(offsetof(%(cmd_name)s::Result, %(field_name)s) == %(offset)d, file.Write(" return error;\n") def WriteValidUnitTest(self, func, file, test, extra = {}): - """Writes a valid unit test.""" + """Writes a valid unit test for the service implementation.""" if func.GetInfo('expectation') == False: test = self._remove_expected_call_re.sub('', test) name = func.name - arg_strings = [] - for count, arg in enumerate(func.GetOriginalArgs()): - arg_strings.append(arg.GetValidArg(func, count, 0)) - gl_arg_strings = [] - for count, arg in enumerate(func.GetOriginalArgs()): - gl_arg_strings.append(arg.GetValidGLArg(func, count, 0)) + arg_strings = [ + arg.GetValidArg(func) \ + for arg in func.GetOriginalArgs() if not arg.IsConstant() + ] + gl_arg_strings = [ + arg.GetValidGLArg(func) \ + for arg in func.GetOriginalArgs() + ] gl_func_name = func.GetGLTestFunctionName() vars = { 'test_name': 'GLES2DecoderTest%d' % file.file_num, @@ -2946,19 +2964,26 @@ COMPILE_ASSERT(offsetof(%(cmd_name)s::Result, %(field_name)s) == %(offset)d, file.Write(test % vars) def WriteInvalidUnitTest(self, func, file, test, extra = {}): - """Writes a invalid unit test.""" - for arg_index, arg in enumerate(func.GetOriginalArgs()): - num_invalid_values = arg.GetNumInvalidValues(func) + """Writes an invalid unit test for the service implementation.""" + for invalid_arg_index, invalid_arg in enumerate(func.GetOriginalArgs()): + # Service implementation does not test constants, as they are not part of + # the call in the service side. + if invalid_arg.IsConstant(): + continue + + num_invalid_values = invalid_arg.GetNumInvalidValues(func) for value_index in range(0, num_invalid_values): arg_strings = [] parse_result = "kNoError" gl_error = None - for count, arg in enumerate(func.GetOriginalArgs()): - if count == arg_index: + for arg in func.GetOriginalArgs(): + if arg.IsConstant(): + continue + if invalid_arg is arg: (arg_string, parse_result, gl_error) = arg.GetInvalidArg( - count, value_index) + value_index) else: - arg_string = arg.GetValidArg(func, count, 0) + arg_string = arg.GetValidArg(func) arg_strings.append(arg_string) gl_arg_strings = [] for arg in func.GetOriginalArgs(): @@ -2971,7 +2996,7 @@ COMPILE_ASSERT(offsetof(%(cmd_name)s::Result, %(field_name)s) == %(offset)d, vars = { 'test_name': 'GLES2DecoderTest%d' % file.file_num , 'name': func.name, - 'arg_index': arg_index, + 'arg_index': invalid_arg_index, 'value_index': value_index, 'gl_func_name': gl_func_name, 'args': ", ".join(arg_strings), @@ -3130,7 +3155,7 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) { for arg in func.GetOriginalArgs(): arg.WriteClientSideValidationCode(file, func) file.Write(" helper_->%s(%s);\n" % - (func.name, func.MakeOriginalArgString(""))) + (func.name, func.MakeHelperArgString(""))) file.Write(" CheckGLError();\n") self.WriteClientGLReturnLog(func, file) file.Write("}\n") @@ -3176,18 +3201,46 @@ TEST_F(GLES2ImplementationTest, %(name)s) { EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } """ - cmd_arg_strings = [] - for count, arg in enumerate(func.GetCmdArgs()): - cmd_arg_strings.append(arg.GetValidClientSideCmdArg(func, count, 0)) - count += 1 - gl_arg_strings = [] - for count, arg in enumerate(func.GetOriginalArgs()): - gl_arg_strings.append(arg.GetValidClientSideArg(func, count, 0)) + cmd_arg_strings = [ + arg.GetValidClientSideCmdArg(func) for arg in func.GetCmdArgs() + ] + + gl_arg_strings = [ + arg.GetValidClientSideArg(func) for arg in func.GetOriginalArgs() + ] + file.Write(code % { 'name': func.name, 'args': ", ".join(gl_arg_strings), 'cmd_args': ", ".join(cmd_arg_strings), }) + + # Test constants for invalid values, as they are not tested by the + # service. + constants = [arg for arg in func.GetOriginalArgs() if arg.IsConstant()] + if constants: + code = """ +TEST_F(GLES2ImplementationTest, %(name)sInvalidConstantArg%(invalid_index)d) { + gl_->%(name)s(%(args)s); + EXPECT_TRUE(NoCommandsWritten()); + EXPECT_EQ(%(gl_error)s, CheckError()); +} +""" + for invalid_arg in constants: + gl_arg_strings = [] + invalid = invalid_arg.GetInvalidArg(func) + for arg in func.GetOriginalArgs(): + if arg is invalid_arg: + gl_arg_strings.append(invalid[0]) + else: + gl_arg_strings.append(arg.GetValidClientSideArg(func)) + + file.Write(code % { + 'name': func.name, + 'invalid_index': func.GetOriginalArgs().index(invalid_arg), + 'args': ", ".join(gl_arg_strings), + 'gl_error': invalid[2], + }) else: if client_test != False: file.Write("// TODO: Implement unit test for %s\n" % func.name) @@ -3321,9 +3374,11 @@ TEST_P(%(test_name)s, %(name)sInvalidValue%(ndx)d_%(check_ndx)d) { } """ name = func.name - arg_strings = [] - for count, arg in enumerate(func.GetOriginalArgs()): - arg_strings.append(arg.GetValidArg(func, count, 0)) + arg_strings = [ + arg.GetValidArg(func) \ + for arg in func.GetOriginalArgs() if not arg.IsConstant() + ] + arg_strings[ndx] = range_check['test_value'] vars = { 'test_name': 'GLES2DecoderTest%d' % file.file_num, @@ -3839,8 +3894,8 @@ TEST_P(%(test_name)s, %(name)sValidArgsNewId) { } """ self.WriteValidUnitTest(func, file, valid_test, { - 'first_arg': func.GetOriginalArgs()[0].GetValidArg(func, 0, 0), - 'first_gl_arg': func.GetOriginalArgs()[0].GetValidGLArg(func, 0, 0), + 'first_arg': func.GetOriginalArgs()[0].GetValidArg(func), + 'first_gl_arg': func.GetOriginalArgs()[0].GetValidGLArg(func), 'resource_type': func.GetOriginalArgs()[1].resource_type, 'gl_gen_func_name': func.GetInfo("gen_func"), }) @@ -3922,13 +3977,13 @@ TEST_F(GLES2ImplementationTest, %(name)s) { EXPECT_TRUE(NoCommandsWritten()); } """ - cmd_arg_strings = [] - for count, arg in enumerate(func.GetCmdArgs()): - cmd_arg_strings.append(arg.GetValidClientSideCmdArg(func, count, 0)) - count += 1 - gl_arg_strings = [] - for count, arg in enumerate(func.GetOriginalArgs()): - gl_arg_strings.append(arg.GetValidClientSideArg(func, count, 0)) + cmd_arg_strings = [ + arg.GetValidClientSideCmdArg(func) for arg in func.GetCmdArgs() + ] + gl_arg_strings = [ + arg.GetValidClientSideArg(func) for arg in func.GetOriginalArgs() + ] + file.Write(code % { 'name': func.name, 'args': ", ".join(gl_arg_strings), @@ -4613,7 +4668,9 @@ class GETnHandler(TypeHandler): arg_string = ( ", ".join(["%s" % arg.name for arg in all_but_last_args])) all_arg_string = ( - ", ".join(["%s" % arg.name for arg in func.GetOriginalArgs()])) + ", ".join([ + "%s" % arg.name + for arg in func.GetOriginalArgs() if not arg.IsConstant()])) self.WriteTraceEvent(func, file) code = """ if (%(func_name)sHelper(%(all_arg_string)s)) { return; @@ -4662,14 +4719,18 @@ TEST_F(GLES2ImplementationTest, %(name)s) { EXPECT_EQ(static_cast<Result::Type>(1), result); } """ - cmd_arg_strings = [] - for count, arg in enumerate(func.GetCmdArgs()[0:-2]): - cmd_arg_strings.append(arg.GetValidClientSideCmdArg(func, count, 0)) - cmd_arg_strings[0] = '123' - gl_arg_strings = [] - for count, arg in enumerate(func.GetOriginalArgs()[0:-1]): - gl_arg_strings.append(arg.GetValidClientSideArg(func, count, 0)) - gl_arg_strings[0] = '123' + first_cmd_arg = func.GetCmdArgs()[0].GetValidNonCachedClientSideCmdArg(func) + if not first_cmd_arg: + return + + first_gl_arg = func.GetCmdArgs()[0].GetValidNonCachedClientSideArg(func) + cmd_arg_strings = [first_cmd_arg] + for arg in func.GetCmdArgs()[1:-2]: + cmd_arg_strings.append(arg.GetValidClientSideCmdArg(func)) + gl_arg_strings = [first_gl_arg] + for arg in func.GetOriginalArgs()[1:-1]: + gl_arg_strings.append(arg.GetValidClientSideArg(func)) + file.Write(code % { 'name': func.name, 'args': ", ".join(gl_arg_strings), @@ -4700,8 +4761,8 @@ TEST_P(%(test_name)s, %(name)sValidArgs) { """ gl_arg_strings = [] valid_pname = '' - for count, arg in enumerate(func.GetOriginalArgs()[:-1]): - arg_value = arg.GetValidGLArg(func, count, 0) + for arg in func.GetOriginalArgs()[:-1]: + arg_value = arg.GetValidGLArg(func) gl_arg_strings.append(arg_value) if arg.name == 'pname': valid_pname = arg_value @@ -4730,20 +4791,43 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) { """ self.WriteInvalidUnitTest(func, file, invalid_test) +class ArrayArgTypeHandler(TypeHandler): + """Base class for type handlers that handle args that are arrays""" -class PUTHandler(TypeHandler): + def __init__(self): + TypeHandler.__init__(self) + + def GetArrayType(self, func): + """Returns the type of the element in the element array being PUT to.""" + for arg in func.GetOriginalArgs(): + if arg.IsPointer(): + element_type = arg.GetPointedType() + return element_type + + # Special case: array type handler is used for a function that is forwarded + # to the actual array type implementation + element_type = func.GetOriginalArgs()[-1].type + assert all(arg.type == element_type \ + for arg in func.GetOriginalArgs()[-self.GetArrayCount(func):]) + return element_type + + def GetArrayCount(self, func): + """Returns the count of the elements in the array being PUT to.""" + return func.GetInfo('count') + +class PUTHandler(ArrayArgTypeHandler): """Handler for glTexParameter_v, glVertexAttrib_v functions.""" def __init__(self): - TypeHandler.__init__(self) + ArrayArgTypeHandler.__init__(self) def WriteServiceUnitTest(self, func, file): """Writes the service unit test for a command.""" expected_call = "EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s));" if func.GetInfo("first_element_only"): - gl_arg_strings = [] - for count, arg in enumerate(func.GetOriginalArgs()): - gl_arg_strings.append(arg.GetValidGLArg(func, count, 0)) + gl_arg_strings = [ + arg.GetValidGLArg(func) for arg in func.GetOriginalArgs() + ] gl_arg_strings[-1] = "*" + gl_arg_strings[-1] expected_call = ("EXPECT_CALL(*gl_, %%(gl_func_name)s(%s));" % ", ".join(gl_arg_strings)) @@ -4759,7 +4843,7 @@ TEST_P(%(test_name)s, %(name)sValidArgs) { } """ extra = { - 'data_type': func.GetInfo('data_type'), + 'data_type': self.GetArrayType(func), 'data_value': func.GetInfo('data_value') or '0', 'expected_call': expected_call, } @@ -4794,15 +4878,15 @@ TEST_P(%(test_name)s, %(name)sValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } """ - gl_arg_strings = [] - gl_any_strings = [] - for count, arg in enumerate(func.GetOriginalArgs()[0:-1]): - gl_arg_strings.append(arg.GetValidGLArg(func, count, 0)) - gl_any_strings.append("_") + gl_arg_strings = [ + arg.GetValidGLArg(func) for arg in func.GetOriginalArgs()[0:-1] + ] + gl_any_strings = ["_"] * len(gl_arg_strings) + extra = { 'data_ref': ("*" if func.GetInfo('first_element_only') else ""), - 'data_type': func.GetInfo('data_type'), - 'data_count': func.GetInfo('count'), + 'data_type': self.GetArrayType(func), + 'data_count': self.GetArrayCount(func), 'data_value': func.GetInfo('data_value') or '0', 'gl_args': ", ".join(gl_arg_strings), 'gl_any_args': ", ".join(gl_any_strings), @@ -4829,8 +4913,8 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) { return error::kOutOfBounds; } """ - file.Write(code % (func.info.data_type, func.info.count)) - if func.is_immediate: + file.Write(code % (self.GetArrayType(func), self.GetArrayCount(func))) + if func.IsImmediate(): file.Write(" if (data_size > immediate_data_size) {\n") file.Write(" return error::kOutOfBounds;\n") file.Write(" }\n") @@ -4848,7 +4932,8 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) { self.WriteClientGLCallLog(func, file) last_arg_name = func.GetLastOriginalArg().name values_str = ' << ", " << '.join( - ["%s[%d]" % (last_arg_name, ndx) for ndx in range(0, func.info.count)]) + ["%s[%d]" % (last_arg_name, ndx) \ + for ndx in range(0, self.GetArrayCount(func))]) file.Write(' GPU_CLIENT_LOG("values: " << %s);\n' % values_str) for arg in func.GetOriginalArgs(): arg.WriteClientSideValidationCode(file, func) @@ -4880,16 +4965,17 @@ TEST_F(GLES2ImplementationTest, %(name)s) { EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } """ - cmd_arg_strings = [] - for count, arg in enumerate(func.GetCmdArgs()[0:-2]): - cmd_arg_strings.append(arg.GetValidClientSideCmdArg(func, count, 0)) - gl_arg_strings = [] - for count, arg in enumerate(func.GetOriginalArgs()[0:-1]): - gl_arg_strings.append(arg.GetValidClientSideArg(func, count, 0)) + cmd_arg_strings = [ + arg.GetValidClientSideCmdArg(func) for arg in func.GetCmdArgs()[0:-2] + ] + gl_arg_strings = [ + arg.GetValidClientSideArg(func) for arg in func.GetOriginalArgs()[0:-1] + ] + file.Write(code % { 'name': func.name, - 'type': func.GetInfo('data_type'), - 'count': func.GetInfo('count'), + 'type': self.GetArrayType(func), + 'count': self.GetArrayCount(func), 'args': ", ".join(gl_arg_strings), 'cmd_args': ", ".join(cmd_arg_strings), }) @@ -4899,7 +4985,7 @@ TEST_F(GLES2ImplementationTest, %(name)s) { file.Write(" static uint32_t ComputeDataSize() {\n") file.Write(" return static_cast<uint32_t>(\n") file.Write(" sizeof(%s) * %d); // NOLINT\n" % - (func.info.data_type, func.info.count)) + (self.GetArrayType(func), self.GetArrayCount(func))) file.Write(" }\n") file.Write("\n") file.Write(" static uint32_t ComputeSize() {\n") @@ -4969,10 +5055,10 @@ TEST_F(GLES2ImplementationTest, %(name)s) { """Overrriden from TypeHandler.""" file.Write("TEST_F(GLES2FormatTest, %s) {\n" % func.name) file.Write(" const int kSomeBaseValueToTestWith = 51;\n") - file.Write(" static %s data[] = {\n" % func.info.data_type) - for v in range(0, func.info.count): + file.Write(" static %s data[] = {\n" % self.GetArrayType(func)) + for v in range(0, self.GetArrayCount(func)): file.Write(" static_cast<%s>(kSomeBaseValueToTestWith + %d),\n" % - (func.info.data_type, v)) + (self.GetArrayType(func), v)) file.Write(" };\n") file.Write(" cmds::%s& cmd = *GetBufferAs<cmds::%s>();\n" % (func.name, func.name)) @@ -5000,15 +5086,15 @@ TEST_F(GLES2ImplementationTest, %(name)s) { file.Write("\n") -class PUTnHandler(TypeHandler): +class PUTnHandler(ArrayArgTypeHandler): """Handler for PUTn 'glUniform__v' type functions.""" def __init__(self): - TypeHandler.__init__(self) + ArrayArgTypeHandler.__init__(self) def WriteServiceUnitTest(self, func, file): """Overridden from TypeHandler.""" - TypeHandler.WriteServiceUnitTest(self, func, file) + ArrayArgTypeHandler.WriteServiceUnitTest(self, func, file) valid_test = """ TEST_P(%(test_name)s, %(name)sValidArgsCountTooLarge) { @@ -5035,8 +5121,9 @@ TEST_P(%(test_name)s, %(name)sValidArgsCountTooLarge) { # the number of elements requested in the command. arg_strings.append("5") else: - gl_arg_strings.append(arg.GetValidGLArg(func, count, 0)) - arg_strings.append(arg.GetValidArg(func, count, 0)) + gl_arg_strings.append(arg.GetValidGLArg(func)) + if not arg.IsConstant(): + arg_strings.append(arg.GetValidArg(func)) extra = { 'gl_args': ", ".join(gl_arg_strings), 'args': ", ".join(arg_strings), @@ -5063,13 +5150,14 @@ TEST_P(%(test_name)s, %(name)sValidArgs) { gl_arg_strings = [] gl_any_strings = [] arg_strings = [] - for count, arg in enumerate(func.GetOriginalArgs()[0:-1]): - gl_arg_strings.append(arg.GetValidGLArg(func, count, 0)) + for arg in func.GetOriginalArgs()[0:-1]: + gl_arg_strings.append(arg.GetValidGLArg(func)) gl_any_strings.append("_") - arg_strings.append(arg.GetValidArg(func, count, 0)) + if not arg.IsConstant(): + arg_strings.append(arg.GetValidArg(func)) extra = { - 'data_type': func.GetInfo('data_type'), - 'data_count': func.GetInfo('count'), + 'data_type': self.GetArrayType(func), + 'data_count': self.GetArrayCount(func), 'args': ", ".join(arg_strings), 'gl_args': ", ".join(gl_arg_strings), 'gl_any_args': ", ".join(gl_any_strings), @@ -5096,8 +5184,8 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) { return error::kOutOfBounds; } """ - file.Write(code % (func.info.data_type, func.info.count)) - if func.is_immediate: + file.Write(code % (self.GetArrayType(func), self.GetArrayCount(func))) + if func.IsImmediate(): file.Write(" if (data_size > immediate_data_size) {\n") file.Write(" return error::kOutOfBounds;\n") file.Write(" }\n") @@ -5116,14 +5204,14 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) { """) values_str = ' << ", " << '.join( ["%s[%d + i * %d]" % ( - last_arg_name, ndx, func.info.count) for ndx in range( - 0, func.info.count)]) + last_arg_name, ndx, self.GetArrayCount(func)) for ndx in range( + 0, self.GetArrayCount(func))]) file.Write(' GPU_CLIENT_LOG(" " << i << ": " << %s);\n' % values_str) file.Write(" }\n });\n") for arg in func.GetOriginalArgs(): arg.WriteClientSideValidationCode(file, func) file.Write(" helper_->%sImmediate(%s);\n" % - (func.name, func.MakeOriginalArgString(""))) + (func.name, func.MakeInitString(""))) file.Write(" CheckGLError();\n") file.Write("}\n") file.Write("\n") @@ -5149,30 +5237,75 @@ TEST_F(GLES2ImplementationTest, %(name)s) { EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } """ - cmd_arg_strings = [] - for count, arg in enumerate(func.GetCmdArgs()[0:-2]): - cmd_arg_strings.append(arg.GetValidClientSideCmdArg(func, count, 0)) + cmd_arg_strings = [ + arg.GetValidClientSideCmdArg(func) for arg in func.GetCmdArgs()[0:-2] + ] gl_arg_strings = [] count_param = 0 - for count, arg in enumerate(func.GetOriginalArgs()[0:-1]): - gl_arg_strings.append(arg.GetValidClientSideArg(func, count, 0)) + for arg in func.GetOriginalArgs()[0:-1]: + valid_value = arg.GetValidClientSideArg(func) + gl_arg_strings.append(valid_value) if arg.name == "count": - count_param = int(arg.GetValidClientSideArg(func, count, 0)) + count_param = int(valid_value) file.Write(code % { 'name': func.name, - 'type': func.GetInfo('data_type'), - 'count': func.GetInfo('count'), + 'type': self.GetArrayType(func), + 'count': self.GetArrayCount(func), 'args': ", ".join(gl_arg_strings), 'cmd_args': ", ".join(cmd_arg_strings), 'count_param': count_param, }) + # Test constants for invalid values, as they are not tested by the + # service. + constants = [ + arg for arg in func.GetOriginalArgs()[0:-1] if arg.IsConstant() + ] + if not constants: + return + + code = """ +TEST_F(GLES2ImplementationTest, %(name)sInvalidConstantArg%(invalid_index)d) { + %(type)s data[%(count_param)d][%(count)d] = {{0}}; + for (int ii = 0; ii < %(count_param)d; ++ii) { + for (int jj = 0; jj < %(count)d; ++jj) { + data[ii][jj] = static_cast<%(type)s>(ii * %(count)d + jj); + } + } + gl_->%(name)s(%(args)s, &data[0][0]); + EXPECT_TRUE(NoCommandsWritten()); + EXPECT_EQ(%(gl_error)s, CheckError()); +} +""" + for invalid_arg in constants: + gl_arg_strings = [] + invalid = invalid_arg.GetInvalidArg(func) + for arg in func.GetOriginalArgs()[0:-1]: + if arg is invalid_arg: + gl_arg_strings.append(invalid[0]) + else: + valid_value = arg.GetValidClientSideArg(func) + gl_arg_strings.append(valid_value) + if arg.name == "count": + count_param = int(valid_value) + + file.Write(code % { + 'name': func.name, + 'invalid_index': func.GetOriginalArgs().index(invalid_arg), + 'type': self.GetArrayType(func), + 'count': self.GetArrayCount(func), + 'args': ", ".join(gl_arg_strings), + 'gl_error': invalid[2], + 'count_param': count_param, + }) + + def WriteImmediateCmdComputeSize(self, func, file): """Overrriden from TypeHandler.""" file.Write(" static uint32_t ComputeDataSize(GLsizei count) {\n") file.Write(" return static_cast<uint32_t>(\n") file.Write(" sizeof(%s) * %d * count); // NOLINT\n" % - (func.info.data_type, func.info.count)) + (self.GetArrayType(func), self.GetArrayCount(func))) file.Write(" }\n") file.Write("\n") file.Write(" static uint32_t ComputeSize(GLsizei count) {\n") @@ -5234,30 +5367,30 @@ TEST_F(GLES2ImplementationTest, %(name)s) { """ file.Write(code % { "name": func.name, - "typed_args": func.MakeTypedOriginalArgString(""), - "args": func.MakeOriginalArgString(""), + "typed_args": func.MakeTypedInitString(""), + "args": func.MakeInitString("") }) def WriteImmediateFormatTest(self, func, file): """Overrriden from TypeHandler.""" args = func.GetCmdArgs() count_param = 0 - for value, arg in enumerate(args): + for arg in args: if arg.name == "count": - count_param = int(arg.GetValidClientSideArg(func, value, 0)) + count_param = int(arg.GetValidClientSideCmdArg(func)) file.Write("TEST_F(GLES2FormatTest, %s) {\n" % func.name) file.Write(" const int kSomeBaseValueToTestWith = 51;\n") - file.Write(" static %s data[] = {\n" % func.info.data_type) - for v in range(0, func.info.count * count_param): + file.Write(" static %s data[] = {\n" % self.GetArrayType(func)) + for v in range(0, self.GetArrayCount(func) * count_param): file.Write(" static_cast<%s>(kSomeBaseValueToTestWith + %d),\n" % - (func.info.data_type, v)) + (self.GetArrayType(func), v)) file.Write(" };\n") file.Write(" cmds::%s& cmd = *GetBufferAs<cmds::%s>();\n" % (func.name, func.name)) file.Write(" const GLsizei kNumElements = %d;\n" % count_param) file.Write(" const size_t kExpectedCmdSize =\n") file.Write(" sizeof(cmd) + kNumElements * sizeof(%s) * %d;\n" % - (func.info.data_type, func.info.count)) + (self.GetArrayType(func), self.GetArrayCount(func))) file.Write(" void* next_cmd = cmd.Set(\n") file.Write(" &cmd") for value, arg in enumerate(args): @@ -5278,10 +5411,10 @@ TEST_F(GLES2ImplementationTest, %(name)s) { file.Write("\n") -class PUTXnHandler(TypeHandler): +class PUTXnHandler(ArrayArgTypeHandler): """Handler for glUniform?f functions.""" def __init__(self): - TypeHandler.__init__(self) + ArrayArgTypeHandler.__init__(self) def WriteHandlerImplementation(self, func, file): """Overrriden from TypeHandler.""" @@ -5290,15 +5423,15 @@ class PUTXnHandler(TypeHandler): """ values = "" args = func.GetOriginalArgs() - count = int(func.GetInfo('count')) + count = int(self.GetArrayCount(func)) num_args = len(args) for ii in range(count): values += "%s, " % args[len(args) - count + ii].name file.Write(code % { 'name': func.name, - 'count': func.GetInfo('count'), - 'type': func.GetInfo('data_type'), + 'count': self.GetArrayCount(func), + 'type': self.GetArrayType(func), 'location': args[0].name, 'args': func.MakeOriginalArgString(""), 'values': values, @@ -5317,10 +5450,10 @@ TEST_P(%(test_name)s, %(name)sValidArgs) { } """ args = func.GetOriginalArgs() - local_args = "%s, 1, _" % args[0].GetValidGLArg(func, 0, 0) + local_args = "%s, 1, _" % args[0].GetValidGLArg(func) self.WriteValidUnitTest(func, file, valid_test, { 'name': func.name, - 'count': func.GetInfo('count'), + 'count': self.GetArrayCount(func), 'local_args': local_args, }) @@ -5335,7 +5468,7 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) { """ self.WriteInvalidUnitTest(func, file, invalid_test, { 'name': func.GetInfo('name'), - 'count': func.GetInfo('count'), + 'count': self.GetArrayCount(func), }) @@ -5377,7 +5510,7 @@ class GLcharHandler(CustomHandler): """ file.Write(code % { - "typed_args": func.MakeTypedOriginalArgString("_"), + "typed_args": func.MakeTypedArgString("_"), "set_code": "\n".join(set_code), "last_arg": last_arg.name }) @@ -5386,9 +5519,9 @@ class GLcharHandler(CustomHandler): """Overrriden from TypeHandler.""" last_arg = func.GetLastOriginalArg() file.Write(" void* Set(void* cmd%s, uint32_t _data_size) {\n" % - func.MakeTypedOriginalArgString("_", True)) + func.MakeTypedCmdArgString("_", True)) file.Write(" static_cast<ValueType*>(cmd)->Init(%s, _data_size);\n" % - func.MakeOriginalArgString("_")) + func.MakeCmdArgString("_")) file.Write(" return NextImmediateCmdAddress<ValueType>(" "cmd, _data_size);\n") file.Write(" }\n") @@ -5735,7 +5868,7 @@ TEST_P(%(test_name)s, %(name)sValidArgs) { } """ args = func.GetOriginalArgs() - id_name = args[0].GetValidGLArg(func, 0, 0) + id_name = args[0].GetValidGLArg(func) get_len_func = func.GetInfo('get_len_func') get_len_enum = func.GetInfo('get_len_enum') sub = { @@ -5743,8 +5876,8 @@ TEST_P(%(test_name)s, %(name)sValidArgs) { 'get_len_func': get_len_func, 'get_len_enum': get_len_enum, 'gl_args': '%s, strlen(kInfo) + 1, _, _' % - args[0].GetValidGLArg(func, 0, 0), - 'args': '%s, kBucketId' % args[0].GetValidArg(func, 0, 0), + args[0].GetValidGLArg(func), + 'args': '%s, kBucketId' % args[0].GetValidArg(func), 'expect_len_code': '', } if get_len_func and get_len_func[0:2] == 'gl': @@ -5771,17 +5904,40 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs) { """Overrriden from TypeHandler.""" pass +class NamedType(object): + """A class that represents a type of an argument in a client function. + + A type of an argument that is to be passed through in the command buffer + command. Currently used only for the arguments that are specificly named in + the 'cmd_buffer_functions.txt' file, mostly enums. + """ + + def __init__(self, info): + assert not 'is_complete' in info or info['is_complete'] == True + self.info = info + self.valid = info['valid'] + if 'invalid' in info: + self.invalid = info['invalid'] + else: + self.invalid = [] + + def GetType(self): + return self.info['type'] + + def GetInvalidValues(self): + return self.invalid -class FunctionInfo(object): - """Holds info about a function.""" + def GetValidValues(self): + return self.valid - def __init__(self, info, type_handler): - for key in info: - setattr(self, key, info[key]) - self.type_handler = type_handler - if not 'type' in info: - self.type = '' + def IsConstant(self): + if not 'is_complete' in self.info: + return False + return len(self.GetValidValues()) == 1 + + def GetConstantValue(self): + return self.GetValidValues()[0] class Argument(object): """A class that represents a function argument.""" @@ -5813,41 +5969,73 @@ class Argument(object): """Returns true if argument is a pointer.""" return False + def IsConstant(self): + """Returns true if the argument has only one valid value.""" + return False + def AddCmdArgs(self, args): """Adds command arguments for this argument to the given list.""" - return args.append(self) + if not self.IsConstant(): + return args.append(self) def AddInitArgs(self, args): """Adds init arguments for this argument to the given list.""" - return args.append(self) + if not self.IsConstant(): + return args.append(self) - def GetValidArg(self, func, offset, index): + def GetValidArg(self, func): """Gets a valid value for this argument.""" - valid_arg = func.GetValidArg(offset) + valid_arg = func.GetValidArg(self) if valid_arg != None: return valid_arg - return str(offset + 1) - def GetValidClientSideArg(self, func, offset, index): - """Gets a valid value for this argument.""" - return str(offset + 1) + index = func.GetOriginalArgs().index(self) + return str(index + 1) - def GetValidClientSideCmdArg(self, func, offset, index): + def GetValidClientSideArg(self, func): """Gets a valid value for this argument.""" - return str(offset + 1) + valid_arg = func.GetValidArg(self) + if valid_arg != None: + return valid_arg - def GetValidGLArg(self, func, offset, index): - """Gets a valid GL value for this argument.""" - valid_arg = func.GetValidArg(offset) + index = func.GetOriginalArgs().index(self) + return str(index + 1) + + def GetValidClientSideCmdArg(self, func): + """Gets a valid value for this argument.""" + valid_arg = func.GetValidArg(self) if valid_arg != None: return valid_arg - return str(offset + 1) + try: + index = func.GetOriginalArgs().index(self) + return str(index + 1) + except ValueError: + pass + index = func.GetCmdArgs().index(self) + return str(index + 1) + + def GetValidGLArg(self, func): + """Gets a valid GL value for this argument.""" + return self.GetValidArg(func) + + def GetValidNonCachedClientSideArg(self, func): + """Returns a valid value for this argument in a GL call. + Using the value will produce a command buffer service invocation. + Returns None if there is no such value.""" + return '123' + + def GetValidNonCachedClientSideCmdArg(self, func): + """Returns a valid value for this argument in a command buffer command. + Calling the GL function with the value returned by + GetValidNonCachedClientSideArg will result in a command buffer command + that contains the value returned by this function. """ + return '123' def GetNumInvalidValues(self, func): """returns the number of invalid values to be tested.""" return 0 - def GetInvalidArg(self, offset, index): + def GetInvalidArg(self, index): """returns an invalid value and expected parse result by index.""" return ("---ERROR0---", "---ERROR2---", None) @@ -5906,19 +6094,19 @@ class BoolArgument(Argument): def __init__(self, name, type): Argument.__init__(self, name, 'GLboolean') - def GetValidArg(self, func, offset, index): + def GetValidArg(self, func): """Gets a valid value for this argument.""" return 'true' - def GetValidClientSideArg(self, func, offset, index): + def GetValidClientSideArg(self, func): """Gets a valid value for this argument.""" return 'true' - def GetValidClientSideCmdArg(self, func, offset, index): + def GetValidClientSideCmdArg(self, func): """Gets a valid value for this argument.""" return 'true' - def GetValidGLArg(self, func, offset, index): + def GetValidGLArg(self, func): """Gets a valid GL value for this argument.""" return 'true' @@ -5935,11 +6123,6 @@ class UniformLocationArgument(Argument): """ file.Write(code % (self.type, self.name, self.type, self.name)) - def GetValidArg(self, func, offset, index): - """Gets a valid value for this argument.""" - return "%d" % (offset + 1) - - class DataSizeArgument(Argument): """class for data_size which Bucket commands do not need.""" @@ -5958,11 +6141,11 @@ class SizeArgument(Argument): def GetNumInvalidValues(self, func): """overridden from Argument.""" - if func.is_immediate: + if func.IsImmediate(): return 0 return 1 - def GetInvalidArg(self, offset, index): + def GetInvalidArg(self, index): """overridden from Argument.""" return ("-1", "kNoError", "GL_INVALID_VALUE") @@ -5991,7 +6174,7 @@ class SizeNotNegativeArgument(SizeArgument): def __init__(self, name, type, gl_type): SizeArgument.__init__(self, name, gl_type) - def GetInvalidArg(self, offset, index): + def GetInvalidArg(self, index): """overridden from SizeArgument.""" return ("-1", "kOutOfBounds", "GL_NO_ERROR") @@ -6010,11 +6193,19 @@ class EnumBaseArgument(Argument): self.gl_error = gl_error name = type[len(gl_type):] self.type_name = name - self.enum_info = _ENUM_LISTS[name] + self.named_type = NamedType(_NAMED_TYPE_INFO[name]) + + def IsConstant(self): + return self.named_type.IsConstant() + + def GetConstantValue(self): + return self.named_type.GetConstantValue() def WriteValidationCode(self, file, func): + if self.named_type.IsConstant(): + return file.Write(" if (!validators_->%s.IsValid(%s)) {\n" % - (ToUnderscore(self.type_name), self.name)) + (ToUnderscore(self.type_name), self.name)) if self.gl_error == "GL_INVALID_ENUM": file.Write( " LOCAL_SET_GL_ERROR_INVALID_ENUM(\"gl%s\", %s, \"%s\");\n" % @@ -6026,41 +6217,67 @@ class EnumBaseArgument(Argument): file.Write(" return error::kNoError;\n") file.Write(" }\n") - def GetValidArg(self, func, offset, index): - valid_arg = func.GetValidArg(offset) + def WriteClientSideValidationCode(self, file, func): + if not self.named_type.IsConstant(): + return + file.Write(" if (%s != %s) {" % (self.name, + self.GetConstantValue())) + file.Write( + " SetGLError(%s, \"gl%s\", \"%s %s\");\n" % + (self.gl_error, func.original_name, self.name, self.gl_error)) + if func.return_type == "void": + file.Write(" return;\n") + else: + file.Write(" return %s;\n" % func.GetErrorReturnString()) + file.Write(" }\n") + + def GetValidArg(self, func): + valid_arg = func.GetValidArg(self) if valid_arg != None: return valid_arg - if 'valid' in self.enum_info: - valid = self.enum_info['valid'] + valid = self.named_type.GetValidValues() + if valid: num_valid = len(valid) - if index >= num_valid: - index = num_valid - 1 - return valid[index] - return str(offset + 1) + return valid[0] + + index = func.GetOriginalArgs().index(self) + return str(index + 1) - def GetValidClientSideArg(self, func, offset, index): + def GetValidClientSideArg(self, func): """Gets a valid value for this argument.""" - return self.GetValidArg(func, offset, index) + return self.GetValidArg(func) - def GetValidClientSideCmdArg(self, func, offset, index): + def GetValidClientSideCmdArg(self, func): """Gets a valid value for this argument.""" - return self.GetValidArg(func, offset, index) + valid_arg = func.GetValidArg(self) + if valid_arg != None: + return valid_arg + + valid = self.named_type.GetValidValues() + if valid: + num_valid = len(valid) + return valid[0] - def GetValidGLArg(self, func, offset, index): + try: + index = func.GetOriginalArgs().index(self) + return str(index + 1) + except ValueError: + pass + index = func.GetCmdArgs().index(self) + return str(index + 1) + + def GetValidGLArg(self, func): """Gets a valid value for this argument.""" - return self.GetValidArg(func, offset, index) + return self.GetValidArg(func) def GetNumInvalidValues(self, func): """returns the number of invalid values to be tested.""" - if 'invalid' in self.enum_info: - invalid = self.enum_info['invalid'] - return len(invalid) - return 0 + return len(self.named_type.GetInvalidValues()) - def GetInvalidArg(self, offset, index): + def GetInvalidArg(self, index): """returns an invalid value by index.""" - if 'invalid' in self.enum_info: - invalid = self.enum_info['invalid'] + invalid = self.named_type.GetInvalidValues() + if invalid: num_invalid = len(invalid) if index >= num_invalid: index = num_invalid - 1 @@ -6115,6 +6332,14 @@ class ImmediatePointerArgument(Argument): def __init__(self, name, type): Argument.__init__(self, name, type) + def IsPointer(self): + return True + + def GetPointedType(self): + match = re.match('(const\s+)?(?P<element_type>[\w]+)\s*\*', self.type) + assert match + return match.groupdict()['element_type'] + def AddCmdArgs(self, args): """Overridden from Argument.""" pass @@ -6188,11 +6413,16 @@ class PointerArgument(Argument): """Returns true if argument is a pointer.""" return True - def GetValidArg(self, func, offset, index): + def GetPointedType(self): + match = re.match('(const\s+)?(?P<element_type>[\w]+)\s*\*', self.type) + assert match + return match.groupdict()['element_type'] + + def GetValidArg(self, func): """Overridden from Argument.""" return "shared_memory_id_, shared_memory_offset_" - def GetValidGLArg(self, func, offset, index): + def GetValidGLArg(self, func): """Overridden from Argument.""" return "reinterpret_cast<%s>(shared_memory_address_)" % self.type @@ -6200,7 +6430,7 @@ class PointerArgument(Argument): """Overridden from Argument.""" return 2 - def GetInvalidArg(self, offset, index): + def GetInvalidArg(self, index): """Overridden from Argument.""" if index == 0: return ("kInvalidSharedMemoryId, 0", "kOutOfBounds", None) @@ -6279,10 +6509,10 @@ class InputStringBucketArgument(Argument): 'name': self.name, }) - def GetValidArg(self, func, offset, index): + def GetValidArg(self, func): return "kNameBucketId" - def GetValidGLArg(self, func, offset, index): + def GetValidGLArg(self, func): return "_" @@ -6314,10 +6544,10 @@ class ResourceIdArgument(Argument): """Overridden from Argument.""" file.Write(" %s %s = c.%s;\n" % (self.type, self.name, self.name)) - def GetValidArg(self, func, offset, index): + def GetValidArg(self, func): return "client_%s_id_" % self.resource_type.lower() - def GetValidGLArg(self, func, offset, index): + def GetValidGLArg(self, func): return "kService%sId" % self.resource_type @@ -6336,10 +6566,10 @@ class ResourceIdBindArgument(Argument): """ file.Write(code % {'type': self.type, 'name': self.name}) - def GetValidArg(self, func, offset, index): + def GetValidArg(self, func): return "client_%s_id_" % self.resource_type.lower() - def GetValidGLArg(self, func, offset, index): + def GetValidGLArg(self, func): return "kService%sId" % self.resource_type @@ -6356,17 +6586,17 @@ class ResourceIdZeroArgument(Argument): """Overridden from Argument.""" file.Write(" %s %s = c.%s;\n" % (self.type, self.name, self.name)) - def GetValidArg(self, func, offset, index): + def GetValidArg(self, func): return "client_%s_id_" % self.resource_type.lower() - def GetValidGLArg(self, func, offset, index): + def GetValidGLArg(self, func): return "kService%sId" % self.resource_type def GetNumInvalidValues(self, func): """returns the number of invalid values to be tested.""" return 1 - def GetInvalidArg(self, offset, index): + def GetInvalidArg(self, index): """returns an invalid value by index.""" return ("kInvalidClientId", "kNoError", "GL_INVALID_VALUE") @@ -6374,38 +6604,111 @@ class ResourceIdZeroArgument(Argument): class Function(object): """A class that represents a function.""" - def __init__(self, original_name, name, info, return_type, original_args, - args_for_cmds, cmd_args, init_args, num_pointer_args): + type_handlers = { + '': TypeHandler(), + 'Bind': BindHandler(), + 'Create': CreateHandler(), + 'Custom': CustomHandler(), + 'Data': DataHandler(), + 'Delete': DeleteHandler(), + 'DELn': DELnHandler(), + 'GENn': GENnHandler(), + 'GETn': GETnHandler(), + 'GLchar': GLcharHandler(), + 'GLcharN': GLcharNHandler(), + 'HandWritten': HandWrittenHandler(), + 'Is': IsHandler(), + 'Manual': ManualHandler(), + 'PUT': PUTHandler(), + 'PUTn': PUTnHandler(), + 'PUTXn': PUTXnHandler(), + 'StateSet': StateSetHandler(), + 'StateSetRGBAlpha': StateSetRGBAlphaHandler(), + 'StateSetFrontBack': StateSetFrontBackHandler(), + 'StateSetFrontBackSeparate': StateSetFrontBackSeparateHandler(), + 'StateSetNamedParameter': StateSetNamedParameter(), + 'STRn': STRnHandler(), + 'Todo': TodoHandler(), + } + + def __init__(self, name, info): self.name = name - self.original_name = original_name + self.original_name = info['original_name'] + + self.original_args = self.ParseArgs(info['original_args']) + + if 'cmd_args' in info: + self.args_for_cmds = self.ParseArgs(info['cmd_args']) + else: + self.args_for_cmds = self.original_args[:] + + self.return_type = info['return_type'] + if self.return_type != 'void': + self.return_arg = CreateArg(info['return_type'] + " result") + else: + self.return_arg = None + + self.num_pointer_args = sum( + [1 for arg in self.args_for_cmds if arg.IsPointer()]) self.info = info - self.type_handler = info.type_handler - self.return_type = return_type - self.original_args = original_args - self.num_pointer_args = num_pointer_args - self.can_auto_generate = num_pointer_args == 0 and return_type == "void" - self.cmd_args = cmd_args - self.init_args = init_args + self.type_handler = self.type_handlers[info['type']] + self.can_auto_generate = (self.num_pointer_args == 0 and + info['return_type'] == "void") self.InitFunction() - self.args_for_cmds = args_for_cmds - self.is_immediate = False + + def ParseArgs(self, arg_string): + """Parses a function arg string.""" + args = [] + parts = arg_string.split(',') + for arg_string in parts: + arg = CreateArg(arg_string) + if arg: + args.append(arg) + return args def IsType(self, type_name): """Returns true if function is a certain type.""" - return self.info.type == type_name + return self.info['type'] == type_name def InitFunction(self): - """Calls the init function for the type handler.""" + """Creates command args and calls the init function for the type handler. + + Creates argument lists for command buffer commands, eg. self.cmd_args and + self.init_args. + Calls the type function initialization. + Override to create different kind of command buffer command argument lists. + """ + self.cmd_args = [] + for arg in self.args_for_cmds: + arg.AddCmdArgs(self.cmd_args) + + self.init_args = [] + for arg in self.args_for_cmds: + arg.AddInitArgs(self.init_args) + + if self.return_arg: + self.init_args.append(self.return_arg) + self.type_handler.InitFunction(self) - def GetInfo(self, name): + def IsImmediate(self): + """Returns whether the function is immediate data function or not.""" + return False + + def GetInfo(self, name, default = None): """Returns a value from the function info for this function.""" - if hasattr(self.info, name): - return getattr(self.info, name) - return None + if name in self.info: + return self.info[name] + return default + + def GetValidArg(self, arg): + """Gets a valid argument value for the parameter arg from the function info + if one exists.""" + try: + index = self.GetOriginalArgs().index(arg) + except ValueError: + return None - def GetValidArg(self, index): - """Gets a valid arg from the function info if one exists.""" valid_args = self.GetInfo('valid_args') if valid_args and str(index) in valid_args: return valid_args[str(index)] @@ -6413,10 +6716,13 @@ class Function(object): def AddInfo(self, name, value): """Adds an info.""" - setattr(self.info, name, value) + self.info[name] = value + + def IsExtension(self): + return self.GetInfo('extension') or self.GetInfo('extension_flag') def IsCoreGLFunction(self): - return (not self.GetInfo('extension') and + return (not self.IsExtension() and not self.GetInfo('pepper_interface')) def InPepperInterface(self, interface): @@ -6428,6 +6734,15 @@ class Function(object): def InAnyPepperExtension(self): return self.IsCoreGLFunction() or self.GetInfo('pepper_interface') + def GetErrorReturnString(self): + if self.GetInfo("error_return"): + return self.GetInfo("error_return") + elif self.return_type == "GLboolean": + return "GL_FALSE" + elif "*" in self.return_type: + return "NULL" + return "0" + def GetGLFunctionName(self): """Gets the function to call to execute GL for this command.""" if self.GetInfo('decoder_func'): @@ -6456,6 +6771,10 @@ class Function(object): """Clears the command args for this function.""" self.cmd_args = [] + def GetCmdConstants(self): + """Gets the constants for this function.""" + return [arg for arg in self.args_for_cmds if arg.IsConstant()] + def GetInitArgs(self): """Gets the init args for this function.""" return self.init_args @@ -6489,6 +6808,25 @@ class Function(object): ["%s%s" % (prefix, arg.name) for arg in args]) return self.__MaybePrependComma(arg_string, add_comma) + def MakeTypedHelperArgString(self, prefix, add_comma = False): + """Gets a list of typed GL arguments after removing unneeded arguments.""" + args = self.GetOriginalArgs() + arg_string = ", ".join( + ["%s %s%s" % ( + arg.type, + prefix, + arg.name, + ) for arg in args if not arg.IsConstant()]) + return self.__MaybePrependComma(arg_string, add_comma) + + def MakeHelperArgString(self, prefix, add_comma = False, separator = ", "): + """Gets a list of GL arguments after removing unneeded arguments.""" + args = self.GetOriginalArgs() + arg_string = separator.join( + ["%s%s" % (prefix, arg.name) + for arg in args if not arg.IsConstant()]) + return self.__MaybePrependComma(arg_string, add_comma) + def MakeTypedPepperArgString(self, prefix): """Gets a list of arguments as they need to be for Pepper.""" if self.GetInfo("pepper_args"): @@ -6555,11 +6893,10 @@ class Function(object): def WriteCmdFlag(self, file): """Writes the cmd cmd_flags constant.""" flags = [] - trace_level = 3 # By default trace only at the highest level - if hasattr(self.info, 'trace_level'): - if (self.info.trace_level < 0) or (self.info.trace_level > 3): - raise KeyError("Unhandled trace_level: %d" % self.info.trace_level) - trace_level = self.info.trace_level + # By default trace only at the highest level 3. + trace_level = int(self.GetInfo('trace_level', default = 3)) + if trace_level not in xrange(0, 4): + raise KeyError("Unhandled trace_level: %d" % trace_level) flags.append('CMD_FLAG_SET_TRACE_LEVEL(%d)' % trace_level) @@ -6713,36 +7050,34 @@ class ImmediateFunction(Function): """A class that represnets an immediate function command.""" def __init__(self, func): - new_args = [] - for arg in func.GetOriginalArgs(): + Function.__init__( + self, + "%sImmediate" % func.name, + func.info) + + def InitFunction(self): + # Override args in original_args and args_for_cmds with immediate versions + # of the args. + + new_original_args = [] + for arg in self.original_args: new_arg = arg.GetImmediateVersion() if new_arg: - new_args.append(new_arg) + new_original_args.append(new_arg) + self.original_args = new_original_args - cmd_args = [] new_args_for_cmds = [] - for arg in func.args_for_cmds: + for arg in self.args_for_cmds: new_arg = arg.GetImmediateVersion() if new_arg: new_args_for_cmds.append(new_arg) - new_arg.AddCmdArgs(cmd_args) - new_init_args = [] - for arg in new_args_for_cmds: - arg.AddInitArgs(new_init_args) + self.args_for_cmds = new_args_for_cmds - Function.__init__( - self, - func.original_name, - "%sImmediate" % func.name, - func.info, - func.return_type, - new_args, - new_args_for_cmds, - cmd_args, - new_init_args, - 0) - self.is_immediate = True + Function.InitFunction(self) + + def IsImmediate(self): + return True def WriteCommandDescription(self, file): """Overridden from Function""" @@ -6798,39 +7133,31 @@ class BucketFunction(Function): """A class that represnets a bucket version of a function command.""" def __init__(self, func): - new_args = [] - for arg in func.GetOriginalArgs(): + Function.__init__( + self, + "%sBucket" % func.name, + func.info) + + def InitFunction(self): + # Override args in original_args and args_for_cmds with bucket versions + # of the args. + + new_original_args = [] + for arg in self.original_args: new_arg = arg.GetBucketVersion() if new_arg: - new_args.append(new_arg) + new_original_args.append(new_arg) + self.original_args = new_original_args - cmd_args = [] new_args_for_cmds = [] - for arg in func.args_for_cmds: + for arg in self.args_for_cmds: new_arg = arg.GetBucketVersion() if new_arg: new_args_for_cmds.append(new_arg) - new_arg.AddCmdArgs(cmd_args) - new_init_args = [] - for arg in new_args_for_cmds: - arg.AddInitArgs(new_init_args) + self.args_for_cmds = new_args_for_cmds - Function.__init__( - self, - func.original_name, - "%sBucket" % func.name, - func.info, - func.return_type, - new_args, - new_args_for_cmds, - cmd_args, - new_init_args, - 0) - -# def InitFunction(self): -# """Overridden from Function""" -# pass + Function.InitFunction(self) def WriteCommandDescription(self, file): """Overridden from Function""" @@ -6904,45 +7231,9 @@ class GLGenerator(object): self.functions = [] self.verbose = verbose self.errors = 0 - self._function_info = {} - self._empty_type_handler = TypeHandler() - self._empty_function_info = FunctionInfo({}, self._empty_type_handler) self.pepper_interfaces = [] self.interface_info = {} - self._type_handlers = { - 'Bind': BindHandler(), - 'Create': CreateHandler(), - 'Custom': CustomHandler(), - 'Data': DataHandler(), - 'Delete': DeleteHandler(), - 'DELn': DELnHandler(), - 'GENn': GENnHandler(), - 'GETn': GETnHandler(), - 'GLchar': GLcharHandler(), - 'GLcharN': GLcharNHandler(), - 'HandWritten': HandWrittenHandler(), - 'Is': IsHandler(), - 'Manual': ManualHandler(), - 'PUT': PUTHandler(), - 'PUTn': PUTnHandler(), - 'PUTXn': PUTXnHandler(), - 'StateSet': StateSetHandler(), - 'StateSetRGBAlpha': StateSetRGBAlphaHandler(), - 'StateSetFrontBack': StateSetFrontBackHandler(), - 'StateSetFrontBackSeparate': StateSetFrontBackSeparateHandler(), - 'StateSetNamedParameter': StateSetNamedParameter(), - 'STRn': STRnHandler(), - 'Todo': TodoHandler(), - } - - for func_name in _FUNCTION_INFO: - info = _FUNCTION_INFO[func_name] - type = '' - if 'type' in info: - type = info['type'] - self._function_info[func_name] = FunctionInfo(info, - self.GetTypeHandler(type)) for interface in _PEPPER_INTERFACES: interface = PepperInterface(interface) self.pepper_interfaces.append(interface) @@ -6952,20 +7243,17 @@ class GLGenerator(object): """Adds a function.""" self.functions.append(func) - def GetTypeHandler(self, name): - """Gets a type info for the given type.""" - if len(name): - if name in self._type_handlers: - return self._type_handlers[name] - else: - raise KeyError("no such type handler: %s" % name) - return self._empty_type_handler - def GetFunctionInfo(self, name): """Gets a type info for the given function name.""" - if name in self._function_info: - return self._function_info[name] - return self._empty_function_info + if name in _FUNCTION_INFO: + func_info = _FUNCTION_INFO[name].copy() + else: + func_info = {} + + if not 'type' in func_info: + func_info['type'] = '' + + return func_info def Log(self, msg): """Prints something if verbose is true.""" @@ -6993,22 +7281,6 @@ class GLGenerator(object): file.Write("} // namespace gpu\n") file.Write("\n") - def ParseArgs(self, arg_string): - """Parses a function arg string.""" - args = [] - num_pointer_args = 0 - parts = arg_string.split(',') - is_gl_enum = False - for arg_string in parts: - if arg_string.startswith('GLenum '): - is_gl_enum = True - arg = CreateArg(arg_string) - if arg: - args.append(arg) - if arg.IsPointer(): - num_pointer_args += 1 - return (args, num_pointer_args, is_gl_enum) - def ParseGLH(self, filename): """Parses the cmd_buffer_functions.txt file and extracts the functions""" f = open(filename, "r") @@ -7019,34 +7291,31 @@ class GLGenerator(object): if match: func_name = match.group(2)[2:] func_info = self.GetFunctionInfo(func_name) - if func_info.type != 'Noop': - return_type = match.group(1).strip() - arg_string = match.group(3) - (args, num_pointer_args, is_gl_enum) = self.ParseArgs(arg_string) - # comment in to find out which functions use bare enums. - # if is_gl_enum: - # self.Log("%s uses bare GLenum" % func_name) - args_for_cmds = args - if hasattr(func_info, 'cmd_args'): - (args_for_cmds, num_pointer_args, is_gl_enum) = ( - self.ParseArgs(getattr(func_info, 'cmd_args'))) - cmd_args = [] - for arg in args_for_cmds: - arg.AddCmdArgs(cmd_args) - init_args = [] - for arg in args_for_cmds: - arg.AddInitArgs(init_args) - return_arg = CreateArg(return_type + " result") - if return_arg: - init_args.append(return_arg) - f = Function(func_name, func_name, func_info, return_type, args, - args_for_cmds, cmd_args, init_args, num_pointer_args) - self.original_functions.append(f) - gen_cmd = f.GetInfo('gen_cmd') - if gen_cmd == True or gen_cmd == None: + if func_info['type'] == 'Noop': + continue + + parsed_func_info = { + 'original_name': func_name, + 'original_args': match.group(3), + 'return_type': match.group(1).strip(), + } + + for k in parsed_func_info.keys(): + if not k in func_info: + func_info[k] = parsed_func_info[k] + + f = Function(func_name, func_info) + self.original_functions.append(f) + + #for arg in f.GetOriginalArgs(): + # if not isinstance(arg, EnumArgument) and arg.type == 'GLenum': + # self.Log("%s uses bare GLenum %s." % (func_name, arg.name)) + + gen_cmd = f.GetInfo('gen_cmd') + if gen_cmd == True or gen_cmd == None: + if not f.type_handler.AddImmediateFunction(self, f): self.AddFunction(f) - f.type_handler.AddImmediateFunction(self, f) - f.type_handler.AddBucketFunction(self, f) + f.type_handler.AddBucketFunction(self, f) self.Log("Auto Generated Functions : %d" % len([f for f in self.functions if f.can_auto_generate or @@ -7058,7 +7327,7 @@ class GLGenerator(object): self.Log("Non Auto Generated Functions: %d" % len(funcs)) for f in funcs: - self.Log(" %-10s %-20s gl%s" % (f.info.type, f.return_type, f.name)) + self.Log(" %-10s %-20s gl%s" % (f.info['type'], f.return_type, f.name)) def WriteCommandIds(self, filename): """Writes the command buffer format""" @@ -7655,53 +7924,58 @@ extern const NameToFunc g_gles2_function_table[] = { def WriteServiceUtilsHeader(self, filename): """Writes the gles2 auto generated utility header.""" file = CHeaderWriter(filename) - for enum in sorted(_ENUM_LISTS.keys()): + for name in sorted(_NAMED_TYPE_INFO.keys()): + named_type = NamedType(_NAMED_TYPE_INFO[name]) + if named_type.IsConstant(): + continue file.Write("ValueValidator<%s> %s;\n" % - (_ENUM_LISTS[enum]['type'], ToUnderscore(enum))) + (named_type.GetType(), ToUnderscore(name))) file.Write("\n") file.Close() def WriteServiceUtilsImplementation(self, filename): """Writes the gles2 auto generated utility implementation.""" file = CHeaderWriter(filename) - enums = sorted(_ENUM_LISTS.keys()) - for enum in enums: - if len(_ENUM_LISTS[enum]['valid']) > 0: + names = sorted(_NAMED_TYPE_INFO.keys()) + for name in names: + named_type = NamedType(_NAMED_TYPE_INFO[name]) + if named_type.IsConstant(): + continue + if named_type.GetValidValues(): file.Write("static const %s valid_%s_table[] = {\n" % - (_ENUM_LISTS[enum]['type'], ToUnderscore(enum))) - for value in _ENUM_LISTS[enum]['valid']: + (named_type.GetType(), ToUnderscore(name))) + for value in named_type.GetValidValues(): file.Write(" %s,\n" % value) file.Write("};\n") file.Write("\n") - file.Write("Validators::Validators()\n") - pre = ': ' - post = ',' - for count, enum in enumerate(enums): - if count + 1 == len(enums): - post = ' {' - if len(_ENUM_LISTS[enum]['valid']) > 0: - code = """ %(pre)s%(name)s( - valid_%(name)s_table, arraysize(valid_%(name)s_table))%(post)s -""" + file.Write("Validators::Validators()") + pre = ' : ' + for count, name in enumerate(names): + named_type = NamedType(_NAMED_TYPE_INFO[name]) + if named_type.IsConstant(): + continue + if named_type.GetValidValues(): + code = """%(pre)s%(name)s( + valid_%(name)s_table, arraysize(valid_%(name)s_table))""" else: - code = """ %(pre)s%(name)s()%(post)s -""" + code = "%(pre)s%(name)s()" file.Write(code % { - 'name': ToUnderscore(enum), - 'pre': pre, - 'post': post, - }) - pre = ' ' + 'name': ToUnderscore(name), + 'pre': pre, + }) + pre = ',\n ' + file.Write(" {\n"); file.Write("}\n\n"); file.Close() def WriteCommonUtilsHeader(self, filename): """Writes the gles2 common utility header.""" file = CHeaderWriter(filename) - enums = sorted(_ENUM_LISTS.keys()) - for enum in enums: - if _ENUM_LISTS[enum]['type'] == 'GLenum': - file.Write("static std::string GetString%s(uint32_t value);\n" % enum) + type_infos = sorted(_NAMED_TYPE_INFO.keys()) + for type_info in type_infos: + if _NAMED_TYPE_INFO[type_info]['type'] == 'GLenum': + file.Write("static std::string GetString%s(uint32_t value);\n" % + type_info) file.Write("\n") file.Close() @@ -7736,14 +8010,14 @@ const size_t GLES2Util::enum_to_string_table_len_ = """) - enums = sorted(_ENUM_LISTS.keys()) + enums = sorted(_NAMED_TYPE_INFO.keys()) for enum in enums: - if _ENUM_LISTS[enum]['type'] == 'GLenum': + if _NAMED_TYPE_INFO[enum]['type'] == 'GLenum': file.Write("std::string GLES2Util::GetString%s(uint32_t value) {\n" % enum) - if len(_ENUM_LISTS[enum]['valid']) > 0: + if len(_NAMED_TYPE_INFO[enum]['valid']) > 0: file.Write(" static const EnumToString string_table[] = {\n") - for value in _ENUM_LISTS[enum]['valid']: + for value in _NAMED_TYPE_INFO[enum]['valid']: file.Write(' { %s, "%s" },\n' % (value, value)) file.Write(""" }; return GLES2Util::GetQualifiedEnumString( @@ -7858,14 +8132,7 @@ const size_t GLES2Util::enum_to_string_table_len_ = file.Write("\n") else: file.Write(" else {\n") - error_return = "0" - if func.GetInfo("error_return"): - error_return = func.GetInfo("error_return") - elif func.return_type == "GLboolean": - error_return = "GL_FALSE" - elif "*" in func.return_type: - error_return = "NULL" - file.Write(" return %s;\n" % error_return) + file.Write(" return %s;\n" % func.GetErrorReturnString()) file.Write(" }\n") file.Write("}\n\n") @@ -7968,17 +8235,22 @@ def main(argv): (options, args) = parser.parse_args(args=argv) # Add in states and capabilites to GLState + gl_state_valid = _NAMED_TYPE_INFO['GLState']['valid'] for state_name in sorted(_STATES.keys()): state = _STATES[state_name] if 'enum' in state: - _ENUM_LISTS['GLState']['valid'].append(state['enum']) + if not state['enum'] in gl_state_valid: + gl_state_valid.append(state['enum']) else: for item in state['states']: if 'extension_flag' in item: continue - _ENUM_LISTS['GLState']['valid'].append(item['enum']) + if not item['enum'] in gl_state_valid: + gl_state_valid.append(item['enum']) for capability in _CAPABILITY_FLAGS: - _ENUM_LISTS['GLState']['valid'].append("GL_%s" % capability['name'].upper()) + valid_value = "GL_%s" % capability['name'].upper() + if not valid_value in gl_state_valid: + gl_state_valid.append(valid_value) # This script lives under gpu/command_buffer, cd to base directory. os.chdir(os.path.dirname(__file__) + "/../..") diff --git a/gpu/command_buffer/client/BUILD.gn b/gpu/command_buffer/client/BUILD.gn new file mode 100644 index 0000000000..535bb49133 --- /dev/null +++ b/gpu/command_buffer/client/BUILD.gn @@ -0,0 +1,166 @@ +# Copyright (c) 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("client") { + sources = [ + "cmd_buffer_helper.cc", + "cmd_buffer_helper.h", + "fenced_allocator.cc", + "fenced_allocator.h", + "gpu_control.h", + "mapped_memory.cc", + "mapped_memory.h", + "ring_buffer.cc", + "ring_buffer.h", + "transfer_buffer.cc", + "transfer_buffer.h", + ] + + if (is_win) { + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + cflags = [ "/wd4267" ] # size_t to int truncation. + } + + all_dependent_configs = [ "//third_party/khronos:khronos_headers" ] + + deps = [ + "//gpu/command_buffer/common", + ] +} + +source_set("gles2_cmd_helper") { + sources = [ + "gles2_cmd_helper.cc", + "gles2_cmd_helper.h", + "gles2_cmd_helper_autogen.h", + ] + + if (is_win) { + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + cflags = [ "/wd4267" ] # size_t to int truncation. + } + + deps = [ ":client" ] +} + +gles2_c_lib_source_files = [ + "gles2_c_lib.cc", + "gles2_c_lib_autogen.h", + "gles2_c_lib_export.h", + "gles2_lib.h", + "gles2_lib.cc", +] + +gles2_implementation_source_files = [ + "buffer_tracker.cc", + "buffer_tracker.h", + "client_context_state.h", + "client_context_state.cc", + "client_context_state_autogen.h", + "client_context_state_impl_autogen.h", + "gles2_impl_export.h", + "gles2_implementation_autogen.h", + "gles2_implementation.cc", + "gles2_implementation.h", + "gles2_implementation_impl_autogen.h", + "gles2_interface.h", + "gles2_trace_implementation_autogen.h", + "gles2_trace_implementation.cc", + "gles2_trace_implementation.h", + "gles2_trace_implementation_impl_autogen.h", + "gpu_memory_buffer_factory.h", + "gpu_memory_buffer_tracker.cc", + "gpu_memory_buffer_tracker.h", + "program_info_manager.cc", + "program_info_manager.h", + "query_tracker.cc", + "query_tracker.h", + "share_group.cc", + "share_group.h", + "vertex_array_object_manager.cc", + "vertex_array_object_manager.h", +] + +# Library emulates GLES2 using command_buffers. +component("gles2_implementation") { + sources = gles2_implementation_source_files + + defines = [ "GLES2_IMPL_IMPLEMENTATION" ] + all_dependent_configs = [ "//third_party/khronos:khronos_headers" ] + + if (is_win) { + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + cflags = [ "/wd4267" ] # size_t to int truncation. + } + + deps = [ + ":gles2_cmd_helper", + "//base", + "//gpu/command_buffer/common", + "//ui/gfx/geometry", + "//ui/gl", + ] +} + +# Library emulates GLES2 using command_buffers. +component("gles2_implementation_client_side_arrays") { + sources = gles2_implementation_source_files + + defines = [ + "GLES2_IMPL_IMPLEMENTATION", + "GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1", + ] + all_dependent_configs = [ "//third_party/khronos:khronos_headers" ] + + if (is_win) { + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + cflags = [ "/wd4267" ] # size_t to int truncation. + } + + deps = [ + ":gles2_cmd_helper", + "//base", + "//gpu/command_buffer/common", + "//ui/gfx/geometry", + "//ui/gl", + ] +} + +component("gl_in_process_context") { + sources = [ + "gl_in_process_context.h", + "gl_in_process_context.cc", + "gl_in_process_context_export.h", + ] + + defines = [ "GL_IN_PROCESS_CONTEXT_IMPLEMENTATION" ] + + deps = [ + ":gles2_implementation", + "//gpu", + "//base", + "//base/third_party/dynamic_annotations", + "//ui/gfx/geometry", + "//ui/gl", + ] +} + +component("gles2_c_lib") { + sources = gles2_c_lib_source_files + defines = [ "GLES2_C_LIB_IMPLEMENTATION" ] + + if (is_win) { + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + cflags = [ "/wd4267" ] # size_t to int truncation. + } + + deps = [ + ":client", + ":gles2_implementation", + "//base", + "//base/third_party/dynamic_annotations", + "//gpu/command_buffer/common", + ] +} + diff --git a/gpu/command_buffer/client/fenced_allocator.cc b/gpu/command_buffer/client/fenced_allocator.cc index 4e405e94e7..80038571be 100644 --- a/gpu/command_buffer/client/fenced_allocator.cc +++ b/gpu/command_buffer/client/fenced_allocator.cc @@ -50,9 +50,9 @@ FencedAllocator::~FencedAllocator() { i = WaitForTokenAndFreeBlock(i); } } - // These checks are not valid if the service has crashed or lost the context. - // DCHECK_EQ(blocks_.size(), 1u); - // DCHECK_EQ(blocks_[0].state, FREE); + + DCHECK_EQ(blocks_.size(), 1u); + DCHECK_EQ(blocks_[0].state, FREE); } // Looks for a non-allocated block that is big enough. Search in the FREE diff --git a/gpu/command_buffer/client/gl_in_process_context.cc b/gpu/command_buffer/client/gl_in_process_context.cc index 2b5e559ba6..33d41563de 100644 --- a/gpu/command_buffer/client/gl_in_process_context.cc +++ b/gpu/command_buffer/client/gl_in_process_context.cc @@ -337,25 +337,33 @@ GLInProcessContext* GLInProcessContext::CreateContext( return context.release(); } -// static -GLInProcessContext* GLInProcessContext::CreateWithSurface( - scoped_refptr<gfx::GLSurface> surface, +GLInProcessContext* GLInProcessContext::Create( scoped_refptr<gpu::InProcessCommandBuffer::Service> service, + scoped_refptr<gfx::GLSurface> surface, + bool is_offscreen, + gfx::AcceleratedWidget window, + const gfx::Size& size, GLInProcessContext* share_context, + bool use_global_share_group, const GLInProcessContextAttribs& attribs, gfx::GpuPreference gpu_preference) { - scoped_ptr<GLInProcessContextImpl> context( - new GLInProcessContextImpl()); - if (!context->Initialize( - surface, - surface->IsOffscreen(), - false, - share_context, - gfx::kNullAcceleratedWidget, - surface->GetSize(), - attribs, - gpu_preference, - service)) + DCHECK(!use_global_share_group || !share_context); + if (surface.get()) { + DCHECK_EQ(surface->IsOffscreen(), is_offscreen); + DCHECK(surface->GetSize() == size); + DCHECK_EQ(gfx::kNullAcceleratedWidget, window); + } + + scoped_ptr<GLInProcessContextImpl> context(new GLInProcessContextImpl()); + if (!context->Initialize(surface, + is_offscreen, + use_global_share_group, + share_context, + gfx::kNullAcceleratedWidget, + size, + attribs, + gpu_preference, + service)) return NULL; return context.release(); diff --git a/gpu/command_buffer/client/gl_in_process_context.h b/gpu/command_buffer/client/gl_in_process_context.h index 60a16653d9..c1478b1113 100644 --- a/gpu/command_buffer/client/gl_in_process_context.h +++ b/gpu/command_buffer/client/gl_in_process_context.h @@ -52,6 +52,7 @@ class GL_IN_PROCESS_CONTEXT_EXPORT GLInProcessContext { // Create a GLInProcessContext, if |is_offscreen| is true, renders to an // offscreen context. |attrib_list| must be NULL or a NONE-terminated list // of attribute/value pairs. + // TODO(boliu): Fix all callsites to use Create and remove this. static GLInProcessContext* CreateContext( bool is_offscreen, gfx::AcceleratedWidget window, @@ -60,14 +61,21 @@ class GL_IN_PROCESS_CONTEXT_EXPORT GLInProcessContext { const GLInProcessContextAttribs& attribs, gfx::GpuPreference gpu_preference); - // Create context with the provided GLSurface. All other arguments match - // CreateContext factory above. Can only be called if the command buffer - // service runs on the same thread as this client because GLSurface is not - // thread safe. - static GLInProcessContext* CreateWithSurface( - scoped_refptr<gfx::GLSurface> surface, + // If |surface| is not NULL, then it must match |is_offscreen| and |size|, + // |window| must be gfx::kNullAcceleratedWidget, and the command buffer + // service must run on the same thread as this client because GLSurface is + // not thread safe. If |surface| is NULL, then the other parameters are used + // to correctly create a surface. + // Only one of |share_context| and |use_global_share_group| can be used at + // the same time. + static GLInProcessContext* Create( scoped_refptr<gpu::InProcessCommandBuffer::Service> service, + scoped_refptr<gfx::GLSurface> surface, + bool is_offscreen, + gfx::AcceleratedWidget window, + const gfx::Size& size, GLInProcessContext* share_context, + bool use_global_share_group, const GLInProcessContextAttribs& attribs, gfx::GpuPreference gpu_preference); diff --git a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h index 9868fd829a..4491f9b301 100644 --- a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h +++ b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h @@ -198,7 +198,6 @@ void CompressedTexImage2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, - GLint border, GLsizei imageSize, uint32_t data_shm_id, uint32_t data_shm_offset) { @@ -210,7 +209,6 @@ void CompressedTexImage2D(GLenum target, internalformat, width, height, - border, imageSize, data_shm_id, data_shm_offset); @@ -222,12 +220,11 @@ void CompressedTexImage2DBucket(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, - GLint border, GLuint bucket_id) { gles2::cmds::CompressedTexImage2DBucket* c = GetCmdSpace<gles2::cmds::CompressedTexImage2DBucket>(); if (c) { - c->Init(target, level, internalformat, width, height, border, bucket_id); + c->Init(target, level, internalformat, width, height, bucket_id); } } @@ -278,11 +275,10 @@ void CopyTexImage2D(GLenum target, GLint x, GLint y, GLsizei width, - GLsizei height, - GLint border) { + GLsizei height) { gles2::cmds::CopyTexImage2D* c = GetCmdSpace<gles2::cmds::CopyTexImage2D>(); if (c) { - c->Init(target, level, internalformat, x, y, width, height, border); + c->Init(target, level, internalformat, x, y, width, height); } } @@ -322,15 +318,6 @@ void CullFace(GLenum mode) { } } -void DeleteBuffers(GLsizei n, - uint32_t buffers_shm_id, - uint32_t buffers_shm_offset) { - gles2::cmds::DeleteBuffers* c = GetCmdSpace<gles2::cmds::DeleteBuffers>(); - if (c) { - c->Init(n, buffers_shm_id, buffers_shm_offset); - } -} - void DeleteBuffersImmediate(GLsizei n, const GLuint* buffers) { const uint32_t size = gles2::cmds::DeleteBuffersImmediate::ComputeSize(n); gles2::cmds::DeleteBuffersImmediate* c = @@ -340,16 +327,6 @@ void DeleteBuffersImmediate(GLsizei n, const GLuint* buffers) { } } -void DeleteFramebuffers(GLsizei n, - uint32_t framebuffers_shm_id, - uint32_t framebuffers_shm_offset) { - gles2::cmds::DeleteFramebuffers* c = - GetCmdSpace<gles2::cmds::DeleteFramebuffers>(); - if (c) { - c->Init(n, framebuffers_shm_id, framebuffers_shm_offset); - } -} - void DeleteFramebuffersImmediate(GLsizei n, const GLuint* framebuffers) { const uint32_t size = gles2::cmds::DeleteFramebuffersImmediate::ComputeSize(n); @@ -368,16 +345,6 @@ void DeleteProgram(GLuint program) { } } -void DeleteRenderbuffers(GLsizei n, - uint32_t renderbuffers_shm_id, - uint32_t renderbuffers_shm_offset) { - gles2::cmds::DeleteRenderbuffers* c = - GetCmdSpace<gles2::cmds::DeleteRenderbuffers>(); - if (c) { - c->Init(n, renderbuffers_shm_id, renderbuffers_shm_offset); - } -} - void DeleteRenderbuffersImmediate(GLsizei n, const GLuint* renderbuffers) { const uint32_t size = gles2::cmds::DeleteRenderbuffersImmediate::ComputeSize(n); @@ -396,15 +363,6 @@ void DeleteShader(GLuint shader) { } } -void DeleteTextures(GLsizei n, - uint32_t textures_shm_id, - uint32_t textures_shm_offset) { - gles2::cmds::DeleteTextures* c = GetCmdSpace<gles2::cmds::DeleteTextures>(); - if (c) { - c->Init(n, textures_shm_id, textures_shm_offset); - } -} - void DeleteTexturesImmediate(GLsizei n, const GLuint* textures) { const uint32_t size = gles2::cmds::DeleteTexturesImmediate::ComputeSize(n); gles2::cmds::DeleteTexturesImmediate* c = @@ -517,12 +475,11 @@ void FramebufferRenderbuffer(GLenum target, void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, - GLuint texture, - GLint level) { + GLuint texture) { gles2::cmds::FramebufferTexture2D* c = GetCmdSpace<gles2::cmds::FramebufferTexture2D>(); if (c) { - c->Init(target, attachment, textarget, texture, level); + c->Init(target, attachment, textarget, texture); } } @@ -533,15 +490,6 @@ void FrontFace(GLenum mode) { } } -void GenBuffers(GLsizei n, - uint32_t buffers_shm_id, - uint32_t buffers_shm_offset) { - gles2::cmds::GenBuffers* c = GetCmdSpace<gles2::cmds::GenBuffers>(); - if (c) { - c->Init(n, buffers_shm_id, buffers_shm_offset); - } -} - void GenBuffersImmediate(GLsizei n, GLuint* buffers) { const uint32_t size = gles2::cmds::GenBuffersImmediate::ComputeSize(n); gles2::cmds::GenBuffersImmediate* c = @@ -558,15 +506,6 @@ void GenerateMipmap(GLenum target) { } } -void GenFramebuffers(GLsizei n, - uint32_t framebuffers_shm_id, - uint32_t framebuffers_shm_offset) { - gles2::cmds::GenFramebuffers* c = GetCmdSpace<gles2::cmds::GenFramebuffers>(); - if (c) { - c->Init(n, framebuffers_shm_id, framebuffers_shm_offset); - } -} - void GenFramebuffersImmediate(GLsizei n, GLuint* framebuffers) { const uint32_t size = gles2::cmds::GenFramebuffersImmediate::ComputeSize(n); gles2::cmds::GenFramebuffersImmediate* c = @@ -577,16 +516,6 @@ void GenFramebuffersImmediate(GLsizei n, GLuint* framebuffers) { } } -void GenRenderbuffers(GLsizei n, - uint32_t renderbuffers_shm_id, - uint32_t renderbuffers_shm_offset) { - gles2::cmds::GenRenderbuffers* c = - GetCmdSpace<gles2::cmds::GenRenderbuffers>(); - if (c) { - c->Init(n, renderbuffers_shm_id, renderbuffers_shm_offset); - } -} - void GenRenderbuffersImmediate(GLsizei n, GLuint* renderbuffers) { const uint32_t size = gles2::cmds::GenRenderbuffersImmediate::ComputeSize(n); gles2::cmds::GenRenderbuffersImmediate* c = @@ -597,15 +526,6 @@ void GenRenderbuffersImmediate(GLsizei n, GLuint* renderbuffers) { } } -void GenTextures(GLsizei n, - uint32_t textures_shm_id, - uint32_t textures_shm_offset) { - gles2::cmds::GenTextures* c = GetCmdSpace<gles2::cmds::GenTextures>(); - if (c) { - c->Init(n, textures_shm_id, textures_shm_offset); - } -} - void GenTexturesImmediate(GLsizei n, GLuint* textures) { const uint32_t size = gles2::cmds::GenTexturesImmediate::ComputeSize(n); gles2::cmds::GenTexturesImmediate* c = @@ -1096,7 +1016,6 @@ void TexImage2D(GLenum target, GLint internalformat, GLsizei width, GLsizei height, - GLint border, GLenum format, GLenum type, uint32_t pixels_shm_id, @@ -1108,7 +1027,6 @@ void TexImage2D(GLenum target, internalformat, width, height, - border, format, type, pixels_shm_id, @@ -1123,16 +1041,6 @@ void TexParameterf(GLenum target, GLenum pname, GLfloat param) { } } -void TexParameterfv(GLenum target, - GLenum pname, - uint32_t params_shm_id, - uint32_t params_shm_offset) { - gles2::cmds::TexParameterfv* c = GetCmdSpace<gles2::cmds::TexParameterfv>(); - if (c) { - c->Init(target, pname, params_shm_id, params_shm_offset); - } -} - void TexParameterfvImmediate(GLenum target, GLenum pname, const GLfloat* params) { @@ -1151,16 +1059,6 @@ void TexParameteri(GLenum target, GLenum pname, GLint param) { } } -void TexParameteriv(GLenum target, - GLenum pname, - uint32_t params_shm_id, - uint32_t params_shm_offset) { - gles2::cmds::TexParameteriv* c = GetCmdSpace<gles2::cmds::TexParameteriv>(); - if (c) { - c->Init(target, pname, params_shm_id, params_shm_offset); - } -} - void TexParameterivImmediate(GLenum target, GLenum pname, const GLint* params) { const uint32_t size = gles2::cmds::TexParameterivImmediate::ComputeSize(); gles2::cmds::TexParameterivImmediate* c = @@ -1204,16 +1102,6 @@ void Uniform1f(GLint location, GLfloat x) { } } -void Uniform1fv(GLint location, - GLsizei count, - uint32_t v_shm_id, - uint32_t v_shm_offset) { - gles2::cmds::Uniform1fv* c = GetCmdSpace<gles2::cmds::Uniform1fv>(); - if (c) { - c->Init(location, count, v_shm_id, v_shm_offset); - } -} - void Uniform1fvImmediate(GLint location, GLsizei count, const GLfloat* v) { const uint32_t size = gles2::cmds::Uniform1fvImmediate::ComputeSize(count); gles2::cmds::Uniform1fvImmediate* c = @@ -1230,16 +1118,6 @@ void Uniform1i(GLint location, GLint x) { } } -void Uniform1iv(GLint location, - GLsizei count, - uint32_t v_shm_id, - uint32_t v_shm_offset) { - gles2::cmds::Uniform1iv* c = GetCmdSpace<gles2::cmds::Uniform1iv>(); - if (c) { - c->Init(location, count, v_shm_id, v_shm_offset); - } -} - void Uniform1ivImmediate(GLint location, GLsizei count, const GLint* v) { const uint32_t size = gles2::cmds::Uniform1ivImmediate::ComputeSize(count); gles2::cmds::Uniform1ivImmediate* c = @@ -1256,16 +1134,6 @@ void Uniform2f(GLint location, GLfloat x, GLfloat y) { } } -void Uniform2fv(GLint location, - GLsizei count, - uint32_t v_shm_id, - uint32_t v_shm_offset) { - gles2::cmds::Uniform2fv* c = GetCmdSpace<gles2::cmds::Uniform2fv>(); - if (c) { - c->Init(location, count, v_shm_id, v_shm_offset); - } -} - void Uniform2fvImmediate(GLint location, GLsizei count, const GLfloat* v) { const uint32_t size = gles2::cmds::Uniform2fvImmediate::ComputeSize(count); gles2::cmds::Uniform2fvImmediate* c = @@ -1282,16 +1150,6 @@ void Uniform2i(GLint location, GLint x, GLint y) { } } -void Uniform2iv(GLint location, - GLsizei count, - uint32_t v_shm_id, - uint32_t v_shm_offset) { - gles2::cmds::Uniform2iv* c = GetCmdSpace<gles2::cmds::Uniform2iv>(); - if (c) { - c->Init(location, count, v_shm_id, v_shm_offset); - } -} - void Uniform2ivImmediate(GLint location, GLsizei count, const GLint* v) { const uint32_t size = gles2::cmds::Uniform2ivImmediate::ComputeSize(count); gles2::cmds::Uniform2ivImmediate* c = @@ -1308,16 +1166,6 @@ void Uniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z) { } } -void Uniform3fv(GLint location, - GLsizei count, - uint32_t v_shm_id, - uint32_t v_shm_offset) { - gles2::cmds::Uniform3fv* c = GetCmdSpace<gles2::cmds::Uniform3fv>(); - if (c) { - c->Init(location, count, v_shm_id, v_shm_offset); - } -} - void Uniform3fvImmediate(GLint location, GLsizei count, const GLfloat* v) { const uint32_t size = gles2::cmds::Uniform3fvImmediate::ComputeSize(count); gles2::cmds::Uniform3fvImmediate* c = @@ -1334,16 +1182,6 @@ void Uniform3i(GLint location, GLint x, GLint y, GLint z) { } } -void Uniform3iv(GLint location, - GLsizei count, - uint32_t v_shm_id, - uint32_t v_shm_offset) { - gles2::cmds::Uniform3iv* c = GetCmdSpace<gles2::cmds::Uniform3iv>(); - if (c) { - c->Init(location, count, v_shm_id, v_shm_offset); - } -} - void Uniform3ivImmediate(GLint location, GLsizei count, const GLint* v) { const uint32_t size = gles2::cmds::Uniform3ivImmediate::ComputeSize(count); gles2::cmds::Uniform3ivImmediate* c = @@ -1360,16 +1198,6 @@ void Uniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w) { } } -void Uniform4fv(GLint location, - GLsizei count, - uint32_t v_shm_id, - uint32_t v_shm_offset) { - gles2::cmds::Uniform4fv* c = GetCmdSpace<gles2::cmds::Uniform4fv>(); - if (c) { - c->Init(location, count, v_shm_id, v_shm_offset); - } -} - void Uniform4fvImmediate(GLint location, GLsizei count, const GLfloat* v) { const uint32_t size = gles2::cmds::Uniform4fvImmediate::ComputeSize(count); gles2::cmds::Uniform4fvImmediate* c = @@ -1386,16 +1214,6 @@ void Uniform4i(GLint location, GLint x, GLint y, GLint z, GLint w) { } } -void Uniform4iv(GLint location, - GLsizei count, - uint32_t v_shm_id, - uint32_t v_shm_offset) { - gles2::cmds::Uniform4iv* c = GetCmdSpace<gles2::cmds::Uniform4iv>(); - if (c) { - c->Init(location, count, v_shm_id, v_shm_offset); - } -} - void Uniform4ivImmediate(GLint location, GLsizei count, const GLint* v) { const uint32_t size = gles2::cmds::Uniform4ivImmediate::ComputeSize(count); gles2::cmds::Uniform4ivImmediate* c = @@ -1405,21 +1223,8 @@ void Uniform4ivImmediate(GLint location, GLsizei count, const GLint* v) { } } -void UniformMatrix2fv(GLint location, - GLsizei count, - GLboolean transpose, - uint32_t value_shm_id, - uint32_t value_shm_offset) { - gles2::cmds::UniformMatrix2fv* c = - GetCmdSpace<gles2::cmds::UniformMatrix2fv>(); - if (c) { - c->Init(location, count, transpose, value_shm_id, value_shm_offset); - } -} - void UniformMatrix2fvImmediate(GLint location, GLsizei count, - GLboolean transpose, const GLfloat* value) { const uint32_t size = gles2::cmds::UniformMatrix2fvImmediate::ComputeSize(count); @@ -1427,25 +1232,12 @@ void UniformMatrix2fvImmediate(GLint location, GetImmediateCmdSpaceTotalSize<gles2::cmds::UniformMatrix2fvImmediate>( size); if (c) { - c->Init(location, count, transpose, value); - } -} - -void UniformMatrix3fv(GLint location, - GLsizei count, - GLboolean transpose, - uint32_t value_shm_id, - uint32_t value_shm_offset) { - gles2::cmds::UniformMatrix3fv* c = - GetCmdSpace<gles2::cmds::UniformMatrix3fv>(); - if (c) { - c->Init(location, count, transpose, value_shm_id, value_shm_offset); + c->Init(location, count, value); } } void UniformMatrix3fvImmediate(GLint location, GLsizei count, - GLboolean transpose, const GLfloat* value) { const uint32_t size = gles2::cmds::UniformMatrix3fvImmediate::ComputeSize(count); @@ -1453,25 +1245,12 @@ void UniformMatrix3fvImmediate(GLint location, GetImmediateCmdSpaceTotalSize<gles2::cmds::UniformMatrix3fvImmediate>( size); if (c) { - c->Init(location, count, transpose, value); - } -} - -void UniformMatrix4fv(GLint location, - GLsizei count, - GLboolean transpose, - uint32_t value_shm_id, - uint32_t value_shm_offset) { - gles2::cmds::UniformMatrix4fv* c = - GetCmdSpace<gles2::cmds::UniformMatrix4fv>(); - if (c) { - c->Init(location, count, transpose, value_shm_id, value_shm_offset); + c->Init(location, count, value); } } void UniformMatrix4fvImmediate(GLint location, GLsizei count, - GLboolean transpose, const GLfloat* value) { const uint32_t size = gles2::cmds::UniformMatrix4fvImmediate::ComputeSize(count); @@ -1479,7 +1258,7 @@ void UniformMatrix4fvImmediate(GLint location, GetImmediateCmdSpaceTotalSize<gles2::cmds::UniformMatrix4fvImmediate>( size); if (c) { - c->Init(location, count, transpose, value); + c->Init(location, count, value); } } @@ -1504,15 +1283,6 @@ void VertexAttrib1f(GLuint indx, GLfloat x) { } } -void VertexAttrib1fv(GLuint indx, - uint32_t values_shm_id, - uint32_t values_shm_offset) { - gles2::cmds::VertexAttrib1fv* c = GetCmdSpace<gles2::cmds::VertexAttrib1fv>(); - if (c) { - c->Init(indx, values_shm_id, values_shm_offset); - } -} - void VertexAttrib1fvImmediate(GLuint indx, const GLfloat* values) { const uint32_t size = gles2::cmds::VertexAttrib1fvImmediate::ComputeSize(); gles2::cmds::VertexAttrib1fvImmediate* c = @@ -1530,15 +1300,6 @@ void VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y) { } } -void VertexAttrib2fv(GLuint indx, - uint32_t values_shm_id, - uint32_t values_shm_offset) { - gles2::cmds::VertexAttrib2fv* c = GetCmdSpace<gles2::cmds::VertexAttrib2fv>(); - if (c) { - c->Init(indx, values_shm_id, values_shm_offset); - } -} - void VertexAttrib2fvImmediate(GLuint indx, const GLfloat* values) { const uint32_t size = gles2::cmds::VertexAttrib2fvImmediate::ComputeSize(); gles2::cmds::VertexAttrib2fvImmediate* c = @@ -1556,15 +1317,6 @@ void VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z) { } } -void VertexAttrib3fv(GLuint indx, - uint32_t values_shm_id, - uint32_t values_shm_offset) { - gles2::cmds::VertexAttrib3fv* c = GetCmdSpace<gles2::cmds::VertexAttrib3fv>(); - if (c) { - c->Init(indx, values_shm_id, values_shm_offset); - } -} - void VertexAttrib3fvImmediate(GLuint indx, const GLfloat* values) { const uint32_t size = gles2::cmds::VertexAttrib3fvImmediate::ComputeSize(); gles2::cmds::VertexAttrib3fvImmediate* c = @@ -1582,15 +1334,6 @@ void VertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w) { } } -void VertexAttrib4fv(GLuint indx, - uint32_t values_shm_id, - uint32_t values_shm_offset) { - gles2::cmds::VertexAttrib4fv* c = GetCmdSpace<gles2::cmds::VertexAttrib4fv>(); - if (c) { - c->Init(indx, values_shm_id, values_shm_offset); - } -} - void VertexAttrib4fvImmediate(GLuint indx, const GLfloat* values) { const uint32_t size = gles2::cmds::VertexAttrib4fvImmediate::ComputeSize(); gles2::cmds::VertexAttrib4fvImmediate* c = @@ -1667,12 +1410,11 @@ void FramebufferTexture2DMultisampleEXT(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, - GLint level, GLsizei samples) { gles2::cmds::FramebufferTexture2DMultisampleEXT* c = GetCmdSpace<gles2::cmds::FramebufferTexture2DMultisampleEXT>(); if (c) { - c->Init(target, attachment, textarget, texture, level, samples); + c->Init(target, attachment, textarget, texture, samples); } } @@ -1687,15 +1429,6 @@ void TexStorage2DEXT(GLenum target, } } -void GenQueriesEXT(GLsizei n, - uint32_t queries_shm_id, - uint32_t queries_shm_offset) { - gles2::cmds::GenQueriesEXT* c = GetCmdSpace<gles2::cmds::GenQueriesEXT>(); - if (c) { - c->Init(n, queries_shm_id, queries_shm_offset); - } -} - void GenQueriesEXTImmediate(GLsizei n, GLuint* queries) { const uint32_t size = gles2::cmds::GenQueriesEXTImmediate::ComputeSize(n); gles2::cmds::GenQueriesEXTImmediate* c = @@ -1705,16 +1438,6 @@ void GenQueriesEXTImmediate(GLsizei n, GLuint* queries) { } } -void DeleteQueriesEXT(GLsizei n, - uint32_t queries_shm_id, - uint32_t queries_shm_offset) { - gles2::cmds::DeleteQueriesEXT* c = - GetCmdSpace<gles2::cmds::DeleteQueriesEXT>(); - if (c) { - c->Init(n, queries_shm_id, queries_shm_offset); - } -} - void DeleteQueriesEXTImmediate(GLsizei n, const GLuint* queries) { const uint32_t size = gles2::cmds::DeleteQueriesEXTImmediate::ComputeSize(n); gles2::cmds::DeleteQueriesEXTImmediate* c = @@ -1766,16 +1489,6 @@ void PopGroupMarkerEXT() { } } -void GenVertexArraysOES(GLsizei n, - uint32_t arrays_shm_id, - uint32_t arrays_shm_offset) { - gles2::cmds::GenVertexArraysOES* c = - GetCmdSpace<gles2::cmds::GenVertexArraysOES>(); - if (c) { - c->Init(n, arrays_shm_id, arrays_shm_offset); - } -} - void GenVertexArraysOESImmediate(GLsizei n, GLuint* arrays) { const uint32_t size = gles2::cmds::GenVertexArraysOESImmediate::ComputeSize(n); @@ -1787,16 +1500,6 @@ void GenVertexArraysOESImmediate(GLsizei n, GLuint* arrays) { } } -void DeleteVertexArraysOES(GLsizei n, - uint32_t arrays_shm_id, - uint32_t arrays_shm_offset) { - gles2::cmds::DeleteVertexArraysOES* c = - GetCmdSpace<gles2::cmds::DeleteVertexArraysOES>(); - if (c) { - c->Init(n, arrays_shm_id, arrays_shm_offset); - } -} - void DeleteVertexArraysOESImmediate(GLsizei n, const GLuint* arrays) { const uint32_t size = gles2::cmds::DeleteVertexArraysOESImmediate::ComputeSize(n); @@ -2011,16 +1714,6 @@ void VertexAttribDivisorANGLE(GLuint index, GLuint divisor) { } } -void ProduceTextureCHROMIUM(GLenum target, - uint32_t mailbox_shm_id, - uint32_t mailbox_shm_offset) { - gles2::cmds::ProduceTextureCHROMIUM* c = - GetCmdSpace<gles2::cmds::ProduceTextureCHROMIUM>(); - if (c) { - c->Init(target, mailbox_shm_id, mailbox_shm_offset); - } -} - void ProduceTextureCHROMIUMImmediate(GLenum target, const GLbyte* mailbox) { const uint32_t size = gles2::cmds::ProduceTextureCHROMIUMImmediate::ComputeSize(); @@ -2032,16 +1725,6 @@ void ProduceTextureCHROMIUMImmediate(GLenum target, const GLbyte* mailbox) { } } -void ConsumeTextureCHROMIUM(GLenum target, - uint32_t mailbox_shm_id, - uint32_t mailbox_shm_offset) { - gles2::cmds::ConsumeTextureCHROMIUM* c = - GetCmdSpace<gles2::cmds::ConsumeTextureCHROMIUM>(); - if (c) { - c->Init(target, mailbox_shm_id, mailbox_shm_offset); - } -} - void ConsumeTextureCHROMIUMImmediate(GLenum target, const GLbyte* mailbox) { const uint32_t size = gles2::cmds::ConsumeTextureCHROMIUMImmediate::ComputeSize(); @@ -2144,7 +1827,6 @@ void AsyncTexImage2DCHROMIUM(GLenum target, GLint internalformat, GLsizei width, GLsizei height, - GLint border, GLenum format, GLenum type, uint32_t pixels_shm_id, @@ -2160,7 +1842,6 @@ void AsyncTexImage2DCHROMIUM(GLenum target, internalformat, width, height, - border, format, type, pixels_shm_id, @@ -2187,17 +1868,6 @@ void WaitAllAsyncTexImage2DCHROMIUM() { } } -void DiscardFramebufferEXT(GLenum target, - GLsizei count, - uint32_t attachments_shm_id, - uint32_t attachments_shm_offset) { - gles2::cmds::DiscardFramebufferEXT* c = - GetCmdSpace<gles2::cmds::DiscardFramebufferEXT>(); - if (c) { - c->Init(target, count, attachments_shm_id, attachments_shm_offset); - } -} - void DiscardFramebufferEXTImmediate(GLenum target, GLsizei count, const GLenum* attachments) { @@ -2227,15 +1897,6 @@ void WaitSyncPointCHROMIUM(GLuint sync_point) { } } -void DrawBuffersEXT(GLsizei count, - uint32_t bufs_shm_id, - uint32_t bufs_shm_offset) { - gles2::cmds::DrawBuffersEXT* c = GetCmdSpace<gles2::cmds::DrawBuffersEXT>(); - if (c) { - c->Init(count, bufs_shm_id, bufs_shm_offset); - } -} - void DrawBuffersEXTImmediate(GLsizei count, const GLenum* bufs) { const uint32_t size = gles2::cmds::DrawBuffersEXTImmediate::ComputeSize(count); diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 6d5edd230e..8f2d3f09c3 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -144,6 +144,7 @@ bool GLES2Implementation::Initialize( unsigned int min_transfer_buffer_size, unsigned int max_transfer_buffer_size, unsigned int mapped_memory_limit) { + TRACE_EVENT0("gpu", "GLES2Implementation::Initialize"); DCHECK_GE(starting_transfer_buffer_size, min_transfer_buffer_size); DCHECK_LE(starting_transfer_buffer_size, max_transfer_buffer_size); DCHECK_GE(min_transfer_buffer_size, kStartingOffset); @@ -215,6 +216,7 @@ bool GLES2Implementation::Initialize( } bool GLES2Implementation::QueryAndCacheStaticState() { + TRACE_EVENT0("gpu", "GLES2Implementation::QueryAndCacheStaticState"); // Setup query for multiple GetIntegerv's static const GLenum pnames[] = { GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, @@ -375,6 +377,8 @@ void GLES2Implementation::SignalQuery(uint32 query, } void GLES2Implementation::SetSurfaceVisible(bool visible) { + TRACE_EVENT1( + "gpu", "GLES2Implementation::SetSurfaceVisible", "visible", visible); // TODO(piman): This probably should be ShallowFlushCHROMIUM(). Flush(); gpu_control_->SetSurfaceVisible(visible); @@ -1616,6 +1620,10 @@ void GLES2Implementation::CompressedTexImage2D( SetGLError(GL_INVALID_VALUE, "glCompressedTexImage2D", "dimension < 0"); return; } + if (border != 0) { + SetGLError(GL_INVALID_VALUE, "glCompressedTexImage2D", "border != 0"); + return; + } if (height == 0 || width == 0) { return; } @@ -1628,7 +1636,7 @@ void GLES2Implementation::CompressedTexImage2D( "glCompressedTexImage2D", offset, image_size); if (buffer && buffer->shm_id() != -1) { helper_->CompressedTexImage2D( - target, level, internalformat, width, height, border, image_size, + target, level, internalformat, width, height, image_size, buffer->shm_id(), buffer->shm_offset() + offset); buffer->set_last_usage_token(helper_->InsertToken()); } @@ -1636,7 +1644,7 @@ void GLES2Implementation::CompressedTexImage2D( } SetBucketContents(kResultBucketId, data, image_size); helper_->CompressedTexImage2DBucket( - target, level, internalformat, width, height, border, kResultBucketId); + target, level, internalformat, width, height, kResultBucketId); // Free the bucket. This is not required but it does free up the memory. // and we don't have to wait for the result so from the client's perspective // it's cheap. @@ -1738,6 +1746,10 @@ void GLES2Implementation::TexImage2D( SetGLError(GL_INVALID_VALUE, "glTexImage2D", "dimension < 0"); return; } + if (border != 0) { + SetGLError(GL_INVALID_VALUE, "glTexImage2D", "border != 0"); + return; + } uint32 size; uint32 unpadded_row_size; uint32 padded_row_size; @@ -1756,7 +1768,7 @@ void GLES2Implementation::TexImage2D( "glTexImage2D", offset, size); if (buffer && buffer->shm_id() != -1) { helper_->TexImage2D( - target, level, internalformat, width, height, border, format, type, + target, level, internalformat, width, height, format, type, buffer->shm_id(), buffer->shm_offset() + offset); buffer->set_last_usage_token(helper_->InsertToken()); CheckGLError(); @@ -1767,7 +1779,7 @@ void GLES2Implementation::TexImage2D( // If there's no data just issue TexImage2D if (!pixels) { helper_->TexImage2D( - target, level, internalformat, width, height, border, format, type, + target, level, internalformat, width, height, format, type, 0, 0); CheckGLError(); return; @@ -1807,7 +1819,7 @@ void GLES2Implementation::TexImage2D( pixels, height, unpadded_row_size, src_padded_row_size, unpack_flip_y_, buffer.address(), padded_row_size); helper_->TexImage2D( - target, level, internalformat, width, height, border, format, type, + target, level, internalformat, width, height, format, type, buffer.shm_id(), buffer.offset()); CheckGLError(); return; @@ -1815,7 +1827,7 @@ void GLES2Implementation::TexImage2D( // No, so send it using TexSubImage2D. helper_->TexImage2D( - target, level, internalformat, width, height, border, format, type, + target, level, internalformat, width, height, format, type, 0, 0); TexSubImage2DImpl( target, level, 0, 0, width, height, format, type, unpadded_row_size, @@ -3476,8 +3488,7 @@ void GLES2Implementation::GetQueryObjectuivEXT( if (!query->CheckResultsAvailable(helper_)) { helper_->WaitForToken(query->token()); if (!query->CheckResultsAvailable(helper_)) { - // TODO(gman): Speed this up. - WaitForCmd(); + FinishHelper(); CHECK(query->CheckResultsAvailable(helper_)); } } @@ -3831,6 +3842,10 @@ void GLES2Implementation::AsyncTexImage2DCHROMIUM( SetGLError(GL_INVALID_VALUE, "glTexImage2D", "dimension < 0"); return; } + if (border != 0) { + SetGLError(GL_INVALID_VALUE, "glTexImage2D", "border != 0"); + return; + } uint32 size; uint32 unpadded_row_size; uint32 padded_row_size; @@ -3844,7 +3859,7 @@ void GLES2Implementation::AsyncTexImage2DCHROMIUM( // If there's no data/buffer just issue the AsyncTexImage2D if (!pixels && !bound_pixel_unpack_transfer_buffer_id_) { helper_->AsyncTexImage2DCHROMIUM( - target, level, internalformat, width, height, border, format, type, + target, level, internalformat, width, height, format, type, 0, 0, 0, 0, 0); return; } @@ -3866,7 +3881,7 @@ void GLES2Implementation::AsyncTexImage2DCHROMIUM( uint32 async_token = NextAsyncUploadToken(); buffer->set_last_async_upload_token(async_token); helper_->AsyncTexImage2DCHROMIUM( - target, level, internalformat, width, height, border, format, type, + target, level, internalformat, width, height, format, type, buffer->shm_id(), buffer->shm_offset() + offset, async_token, async_upload_sync_shm_id_, async_upload_sync_shm_offset_); diff --git a/gpu/command_buffer/client/gles2_implementation.h b/gpu/command_buffer/client/gles2_implementation.h index 7404e90d50..b5ed282d55 100644 --- a/gpu/command_buffer/client/gles2_implementation.h +++ b/gpu/command_buffer/client/gles2_implementation.h @@ -110,6 +110,12 @@ namespace gles2 { class ImageFactory; class VertexArrayObjectManager; +class GLES2ImplementationErrorMessageCallback { + public: + virtual ~GLES2ImplementationErrorMessageCallback() { } + virtual void OnErrorMessage(const char* msg, int id) = 0; +}; + // This class emulates GLES2 over command buffers. It can be used by a client // program so that the program does not need deal with shared memory and command // buffer management. See gl2_lib.h. Note that there is a performance gain to @@ -123,11 +129,6 @@ class GLES2_IMPL_EXPORT GLES2Implementation enum MappedMemoryLimit { kNoLimit = MappedMemoryManager::kNoLimit, }; - class ErrorMessageCallback { - public: - virtual ~ErrorMessageCallback() { } - virtual void OnErrorMessage(const char* msg, int id) = 0; - }; // Stores GL state that never changes. struct GLES2_IMPL_EXPORT GLStaticState { @@ -249,7 +250,8 @@ class GLES2_IMPL_EXPORT GLES2Implementation virtual void SendManagedMemoryStats(const ManagedMemoryStats& stats) OVERRIDE; - void SetErrorMessageCallback(ErrorMessageCallback* callback) { + void SetErrorMessageCallback( + GLES2ImplementationErrorMessageCallback* callback) { error_message_callback_ = callback; } @@ -769,7 +771,7 @@ class GLES2_IMPL_EXPORT GLES2Implementation scoped_ptr<GpuMemoryBufferTracker> gpu_memory_buffer_tracker_; - ErrorMessageCallback* error_message_callback_; + GLES2ImplementationErrorMessageCallback* error_message_callback_; scoped_ptr<std::string> current_trace_name_; diff --git a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h index 88cf0f44e6..4f721a8d1c 100644 --- a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h +++ b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h @@ -232,8 +232,11 @@ void GLES2Implementation::CopyTexImage2D(GLenum target, SetGLError(GL_INVALID_VALUE, "glCopyTexImage2D", "height < 0"); return; } - helper_->CopyTexImage2D( - target, level, internalformat, x, y, width, height, border); + if (border != 0) { + SetGLError(GL_INVALID_VALUE, "glCopyTexImage2D", "border GL_INVALID_VALUE"); + return; + } + helper_->CopyTexImage2D(target, level, internalformat, x, y, width, height); CheckGLError(); } @@ -462,7 +465,12 @@ void GLES2Implementation::FramebufferTexture2D(GLenum target, << GLES2Util::GetStringAttachment(attachment) << ", " << GLES2Util::GetStringTextureTarget(textarget) << ", " << texture << ", " << level << ")"); - helper_->FramebufferTexture2D(target, attachment, textarget, texture, level); + if (level != 0) { + SetGLError( + GL_INVALID_VALUE, "glFramebufferTexture2D", "level GL_INVALID_VALUE"); + return; + } + helper_->FramebufferTexture2D(target, attachment, textarget, texture); CheckGLError(); } @@ -1488,7 +1496,12 @@ void GLES2Implementation::UniformMatrix2fv(GLint location, SetGLError(GL_INVALID_VALUE, "glUniformMatrix2fv", "count < 0"); return; } - helper_->UniformMatrix2fvImmediate(location, count, transpose, value); + if (transpose != false) { + SetGLError( + GL_INVALID_VALUE, "glUniformMatrix2fv", "transpose GL_INVALID_VALUE"); + return; + } + helper_->UniformMatrix2fvImmediate(location, count, value); CheckGLError(); } @@ -1515,7 +1528,12 @@ void GLES2Implementation::UniformMatrix3fv(GLint location, SetGLError(GL_INVALID_VALUE, "glUniformMatrix3fv", "count < 0"); return; } - helper_->UniformMatrix3fvImmediate(location, count, transpose, value); + if (transpose != false) { + SetGLError( + GL_INVALID_VALUE, "glUniformMatrix3fv", "transpose GL_INVALID_VALUE"); + return; + } + helper_->UniformMatrix3fvImmediate(location, count, value); CheckGLError(); } @@ -1545,7 +1563,12 @@ void GLES2Implementation::UniformMatrix4fv(GLint location, SetGLError(GL_INVALID_VALUE, "glUniformMatrix4fv", "count < 0"); return; } - helper_->UniformMatrix4fvImmediate(location, count, transpose, value); + if (transpose != false) { + SetGLError( + GL_INVALID_VALUE, "glUniformMatrix4fv", "transpose GL_INVALID_VALUE"); + return; + } + helper_->UniformMatrix4fvImmediate(location, count, value); CheckGLError(); } @@ -1767,6 +1790,12 @@ void GLES2Implementation::FramebufferTexture2DMultisampleEXT(GLenum target, << GLES2Util::GetStringAttachment(attachment) << ", " << GLES2Util::GetStringTextureTarget(textarget) << ", " << texture << ", " << level << ", " << samples << ")"); + if (level != 0) { + SetGLError(GL_INVALID_VALUE, + "glFramebufferTexture2DMultisampleEXT", + "level GL_INVALID_VALUE"); + return; + } if (samples < 0) { SetGLError(GL_INVALID_VALUE, "glFramebufferTexture2DMultisampleEXT", @@ -1774,7 +1803,7 @@ void GLES2Implementation::FramebufferTexture2DMultisampleEXT(GLenum target, return; } helper_->FramebufferTexture2DMultisampleEXT( - target, attachment, textarget, texture, level, samples); + target, attachment, textarget, texture, samples); CheckGLError(); } @@ -2035,8 +2064,8 @@ void GLES2Implementation::DiscardFramebufferEXT(GLenum target, void GLES2Implementation::LoseContextCHROMIUM(GLenum current, GLenum other) { GPU_CLIENT_SINGLE_THREAD_CHECK(); GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glLoseContextCHROMIUM(" - << GLES2Util::GetStringEnum(current) << ", " - << GLES2Util::GetStringEnum(other) << ")"); + << GLES2Util::GetStringResetStatus(current) << ", " + << GLES2Util::GetStringResetStatus(other) << ")"); helper_->LoseContextCHROMIUM(current, other); CheckGLError(); } diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc index b76caa2c48..a35f1f969c 100644 --- a/gpu/command_buffer/client/gles2_implementation_unittest.cc +++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc @@ -2309,7 +2309,7 @@ TEST_F(GLES2ImplementationTest, TexImage2D) { Cmds expected; expected.tex_image_2d.Init( - kTarget, kLevel, kFormat, kWidth, kHeight, kBorder, kFormat, kType, + kTarget, kLevel, kFormat, kWidth, kHeight, kFormat, kType, mem1.id, mem1.offset); expected.set_token.Init(GetNextToken()); gl_->TexImage2D( @@ -2326,7 +2326,7 @@ TEST_F(GLES2ImplementationTest, TexImage2D) { ExpectedMemoryInfo mem2 = GetExpectedMemory(sizeof(pixels)); Cmds2 expected2; expected2.tex_image_2d.Init( - kTarget, kLevel, kFormat, kWidth, kHeight, kBorder, kFormat, kType, + kTarget, kLevel, kFormat, kWidth, kHeight, kFormat, kType, mem2.id, mem2.offset); expected2.set_token.Init(GetNextToken()); const void* commands2 = GetPut(); @@ -2381,7 +2381,7 @@ TEST_F(GLES2ImplementationTest, TexImage2D2Writes) { Cmds expected; expected.tex_image_2d.Init( - kTarget, kLevel, kFormat, kWidth, kHeight, kBorder, kFormat, kType, + kTarget, kLevel, kFormat, kWidth, kHeight, kFormat, kType, 0, 0); expected.tex_sub_image_2d1.Init( kTarget, kLevel, 0, 0, kWidth, kHeight / 2, kFormat, kType, @@ -2414,7 +2414,7 @@ TEST_F(GLES2ImplementationTest, TexImage2D2Writes) { ExpectedMemoryInfo mem3 = GetExpectedMemory(half_size); ExpectedMemoryInfo mem4 = GetExpectedMemory(half_size); expected.tex_image_2d.Init( - kTarget, kLevel, kFormat, kWidth, kHeight, kBorder, kFormat, kType, + kTarget, kLevel, kFormat, kWidth, kHeight, kFormat, kType, 0, 0); expected.tex_sub_image_2d1.Init( kTarget, kLevel, 0, kHeight / 2, kWidth, kHeight / 2, kFormat, kType, @@ -2478,7 +2478,7 @@ TEST_F(GLES2ImplementationTest, TexSubImage2DFlipY) { Cmds expected; expected.pixel_store_i1.Init(GL_UNPACK_ALIGNMENT, kPixelStoreUnpackAlignment); expected.tex_image_2d.Init( - kTarget, kLevel, kFormat, kTextureWidth, kTextureHeight, kBorder, kFormat, + kTarget, kLevel, kFormat, kTextureWidth, kTextureHeight, kFormat, kType, 0, 0); expected.pixel_store_i2.Init(GL_UNPACK_FLIP_Y_CHROMIUM, GL_TRUE); expected.tex_sub_image_2d1.Init(kTarget, kLevel, kSubImageXOffset, @@ -2590,7 +2590,7 @@ TEST_F(GLES2ImplementationTest, SubImageUnpack) { texSubImageExpected.pixel_store_i2.Init( GL_UNPACK_FLIP_Y_CHROMIUM, flip_y); texSubImageExpected.tex_image_2d.Init( - GL_TEXTURE_2D, kLevel, kFormat, kTexWidth, kTexHeight, kBorder, + GL_TEXTURE_2D, kLevel, kFormat, kTexWidth, kTexHeight, kFormat, kType, 0, 0); texSubImageExpected.tex_sub_image_2d.Init( GL_TEXTURE_2D, kLevel, kTexSubXOffset, kTexSubYOffset, @@ -2608,7 +2608,7 @@ TEST_F(GLES2ImplementationTest, SubImageUnpack) { GL_UNPACK_FLIP_Y_CHROMIUM, flip_y); texImageExpected.tex_image_2d.Init( GL_TEXTURE_2D, kLevel, kFormat, kSrcSubImageWidth, - kSrcSubImageHeight, kBorder, kFormat, kType, mem.id, mem.offset); + kSrcSubImageHeight, kFormat, kType, mem.id, mem.offset); EXPECT_EQ(0, memcmp( &texImageExpected, commands, sizeof(texImageExpected))); } @@ -2631,6 +2631,93 @@ TEST_F(GLES2ImplementationTest, SubImageUnpack) { } } +// Test texture related calls with invalid arguments. +TEST_F(GLES2ImplementationTest, TextureInvalidArguments) { + struct Cmds { + cmds::TexImage2D tex_image_2d; + cmd::SetToken set_token; + }; + const GLenum kTarget = GL_TEXTURE_2D; + const GLint kLevel = 0; + const GLenum kFormat = GL_RGB; + const GLsizei kWidth = 3; + const GLsizei kHeight = 4; + const GLint kBorder = 0; + const GLint kInvalidBorder = 1; + const GLenum kType = GL_UNSIGNED_BYTE; + const GLint kPixelStoreUnpackAlignment = 4; + static uint8 pixels[] = { + 11, 12, 13, 13, 14, 15, 15, 16, 17, 101, 102, 103, + 21, 22, 23, 23, 24, 25, 25, 26, 27, 201, 202, 203, + 31, 32, 33, 33, 34, 35, 35, 36, 37, 123, 124, 125, + 41, 42, 43, 43, 44, 45, 45, 46, 47, + }; + + // Verify that something works. + + ExpectedMemoryInfo mem1 = GetExpectedMemory(sizeof(pixels)); + + Cmds expected; + expected.tex_image_2d.Init( + kTarget, kLevel, kFormat, kWidth, kHeight, kFormat, kType, + mem1.id, mem1.offset); + expected.set_token.Init(GetNextToken()); + gl_->TexImage2D( + kTarget, kLevel, kFormat, kWidth, kHeight, kBorder, kFormat, kType, + pixels); + EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); + EXPECT_TRUE(CheckRect( + kWidth, kHeight, kFormat, kType, kPixelStoreUnpackAlignment, false, + pixels, mem1.ptr)); + + ClearCommands(); + + // Use invalid border. + gl_->TexImage2D( + kTarget, kLevel, kFormat, kWidth, kHeight, kInvalidBorder, kFormat, kType, + pixels); + + EXPECT_TRUE(NoCommandsWritten()); + EXPECT_EQ(GL_INVALID_VALUE, CheckError()); + + ClearCommands(); + + gl_->AsyncTexImage2DCHROMIUM( + kTarget, kLevel, kFormat, kWidth, kHeight, kInvalidBorder, kFormat, kType, + NULL); + + EXPECT_TRUE(NoCommandsWritten()); + EXPECT_EQ(GL_INVALID_VALUE, CheckError()); + + ClearCommands(); + + // Checking for CompressedTexImage2D argument validation is a bit tricky due + // to (runtime-detected) compression formats. Try to infer the error with an + // aux check. + const GLenum kCompressedFormat = GL_ETC1_RGB8_OES; + gl_->CompressedTexImage2D( + kTarget, kLevel, kCompressedFormat, kWidth, kHeight, kBorder, + arraysize(pixels), pixels); + + // In the above, kCompressedFormat and arraysize(pixels) are possibly wrong + // values. First ensure that these do not cause failures at the client. If + // this check ever fails, it probably means that client checks more than at + // the time of writing of this test. In this case, more code needs to be + // written for this test. + EXPECT_FALSE(NoCommandsWritten()); + + ClearCommands(); + + // Changing border to invalid border should make the call fail at the client + // checks. + gl_->CompressedTexImage2D( + kTarget, kLevel, kCompressedFormat, kWidth, kHeight, kInvalidBorder, + arraysize(pixels), pixels); + EXPECT_TRUE(NoCommandsWritten()); + EXPECT_EQ(GL_INVALID_VALUE, CheckError()); +} + + // Binds can not be cached with bind_generates_resource = false because // our id might not be valid. More specifically if you bind on contextA then // delete on contextB the resource is still bound on contextA but GetInterger @@ -3188,9 +3275,11 @@ TEST_F(GLES2ImplementationTest, LimitSizeAndOffsetTo32Bit) { EXPECT_STREQ(kSizeOverflowMessage, GetLastError().c_str()); // Call MapBufferSubDataCHROMIUM() should succeed with legal paramaters. - EXPECT_TRUE(NULL != gl_->MapBufferSubDataCHROMIUM( - GL_ARRAY_BUFFER, 0, 1, GL_WRITE_ONLY)); + void* mem = + gl_->MapBufferSubDataCHROMIUM(GL_ARRAY_BUFFER, 0, 1, GL_WRITE_ONLY); + EXPECT_TRUE(NULL != mem); EXPECT_EQ(GL_NO_ERROR, CheckError()); + gl_->UnmapBufferSubDataCHROMIUM(mem); // MapBufferSubDataCHROMIUM: offset EXPECT_TRUE(NULL == gl_->MapBufferSubDataCHROMIUM( diff --git a/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h b/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h index e6bd8a1a39..d75697e357 100644 --- a/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h +++ b/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h @@ -168,9 +168,9 @@ TEST_F(GLES2ImplementationTest, ClearDepthf) { cmds::ClearDepthf cmd; }; Cmds expected; - expected.cmd.Init(1); + expected.cmd.Init(0.5f); - gl_->ClearDepthf(1); + gl_->ClearDepthf(0.5f); EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } @@ -214,12 +214,18 @@ TEST_F(GLES2ImplementationTest, CopyTexImage2D) { cmds::CopyTexImage2D cmd; }; Cmds expected; - expected.cmd.Init(GL_TEXTURE_2D, 2, GL_ALPHA, 4, 5, 6, 7, 0); + expected.cmd.Init(GL_TEXTURE_2D, 2, GL_ALPHA, 4, 5, 6, 7); gl_->CopyTexImage2D(GL_TEXTURE_2D, 2, GL_ALPHA, 4, 5, 6, 7, 0); EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } +TEST_F(GLES2ImplementationTest, CopyTexImage2DInvalidConstantArg7) { + gl_->CopyTexImage2D(GL_TEXTURE_2D, 2, GL_ALPHA, 4, 5, 6, 7, 1); + EXPECT_TRUE(NoCommandsWritten()); + EXPECT_EQ(GL_INVALID_VALUE, CheckError()); +} + TEST_F(GLES2ImplementationTest, CopyTexSubImage2D) { struct Cmds { cmds::CopyTexSubImage2D cmd; @@ -425,13 +431,20 @@ TEST_F(GLES2ImplementationTest, FramebufferTexture2D) { cmds::FramebufferTexture2D cmd; }; Cmds expected; - expected.cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4, 0); + expected.cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4); gl_->FramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4, 0); EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } +TEST_F(GLES2ImplementationTest, FramebufferTexture2DInvalidConstantArg4) { + gl_->FramebufferTexture2D( + GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4, 1); + EXPECT_TRUE(NoCommandsWritten()); + EXPECT_EQ(GL_INVALID_VALUE, CheckError()); +} + TEST_F(GLES2ImplementationTest, FrontFace) { struct Cmds { cmds::FrontFace cmd; @@ -899,9 +912,9 @@ TEST_F(GLES2ImplementationTest, LineWidth) { cmds::LineWidth cmd; }; Cmds expected; - expected.cmd.Init(1); + expected.cmd.Init(0.5f); - gl_->LineWidth(1); + gl_->LineWidth(0.5f); EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } @@ -1053,9 +1066,9 @@ TEST_F(GLES2ImplementationTest, TexParameterf) { cmds::TexParameterf cmd; }; Cmds expected; - expected.cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, 3); + expected.cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - gl_->TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, 3); + gl_->TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } @@ -1080,9 +1093,9 @@ TEST_F(GLES2ImplementationTest, TexParameteri) { cmds::TexParameteri cmd; }; Cmds expected; - expected.cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, 3); + expected.cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, 3); + gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } @@ -1347,11 +1360,23 @@ TEST_F(GLES2ImplementationTest, UniformMatrix2fv) { data[ii][jj] = static_cast<GLfloat>(ii * 4 + jj); } } - expected.cmd.Init(1, 2, false, &data[0][0]); + expected.cmd.Init(1, 2, &data[0][0]); gl_->UniformMatrix2fv(1, 2, false, &data[0][0]); EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } +TEST_F(GLES2ImplementationTest, UniformMatrix2fvInvalidConstantArg2) { + GLfloat data[2][4] = {{0}}; + for (int ii = 0; ii < 2; ++ii) { + for (int jj = 0; jj < 4; ++jj) { + data[ii][jj] = static_cast<GLfloat>(ii * 4 + jj); + } + } + gl_->UniformMatrix2fv(1, 2, true, &data[0][0]); + EXPECT_TRUE(NoCommandsWritten()); + EXPECT_EQ(GL_INVALID_VALUE, CheckError()); +} + TEST_F(GLES2ImplementationTest, UniformMatrix3fv) { GLfloat data[2][9] = {{0}}; struct Cmds { @@ -1365,11 +1390,23 @@ TEST_F(GLES2ImplementationTest, UniformMatrix3fv) { data[ii][jj] = static_cast<GLfloat>(ii * 9 + jj); } } - expected.cmd.Init(1, 2, false, &data[0][0]); + expected.cmd.Init(1, 2, &data[0][0]); gl_->UniformMatrix3fv(1, 2, false, &data[0][0]); EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } +TEST_F(GLES2ImplementationTest, UniformMatrix3fvInvalidConstantArg2) { + GLfloat data[2][9] = {{0}}; + for (int ii = 0; ii < 2; ++ii) { + for (int jj = 0; jj < 9; ++jj) { + data[ii][jj] = static_cast<GLfloat>(ii * 9 + jj); + } + } + gl_->UniformMatrix3fv(1, 2, true, &data[0][0]); + EXPECT_TRUE(NoCommandsWritten()); + EXPECT_EQ(GL_INVALID_VALUE, CheckError()); +} + TEST_F(GLES2ImplementationTest, UniformMatrix4fv) { GLfloat data[2][16] = {{0}}; struct Cmds { @@ -1383,11 +1420,23 @@ TEST_F(GLES2ImplementationTest, UniformMatrix4fv) { data[ii][jj] = static_cast<GLfloat>(ii * 16 + jj); } } - expected.cmd.Init(1, 2, false, &data[0][0]); + expected.cmd.Init(1, 2, &data[0][0]); gl_->UniformMatrix4fv(1, 2, false, &data[0][0]); EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } +TEST_F(GLES2ImplementationTest, UniformMatrix4fvInvalidConstantArg2) { + GLfloat data[2][16] = {{0}}; + for (int ii = 0; ii < 2; ++ii) { + for (int jj = 0; jj < 16; ++jj) { + data[ii][jj] = static_cast<GLfloat>(ii * 16 + jj); + } + } + gl_->UniformMatrix4fv(1, 2, true, &data[0][0]); + EXPECT_TRUE(NoCommandsWritten()); + EXPECT_EQ(GL_INVALID_VALUE, CheckError()); +} + TEST_F(GLES2ImplementationTest, UseProgram) { struct Cmds { cmds::UseProgram cmd; @@ -1571,14 +1620,21 @@ TEST_F(GLES2ImplementationTest, FramebufferTexture2DMultisampleEXT) { cmds::FramebufferTexture2DMultisampleEXT cmd; }; Cmds expected; - expected.cmd.Init( - GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4, 0, 6); + expected.cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4, 6); gl_->FramebufferTexture2DMultisampleEXT( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4, 0, 6); EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } +TEST_F(GLES2ImplementationTest, + FramebufferTexture2DMultisampleEXTInvalidConstantArg4) { + gl_->FramebufferTexture2DMultisampleEXT( + GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 4, 1, 6); + EXPECT_TRUE(NoCommandsWritten()); + EXPECT_EQ(GL_INVALID_VALUE, CheckError()); +} + TEST_F(GLES2ImplementationTest, TexStorage2DEXT) { struct Cmds { cmds::TexStorage2DEXT cmd; @@ -1796,9 +1852,10 @@ TEST_F(GLES2ImplementationTest, LoseContextCHROMIUM) { cmds::LoseContextCHROMIUM cmd; }; Cmds expected; - expected.cmd.Init(1, 2); + expected.cmd.Init(GL_GUILTY_CONTEXT_RESET_ARB, GL_GUILTY_CONTEXT_RESET_ARB); - gl_->LoseContextCHROMIUM(1, 2); + gl_->LoseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB, + GL_GUILTY_CONTEXT_RESET_ARB); EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected))); } // TODO: Implement unit test for InsertSyncPointCHROMIUM diff --git a/gpu/command_buffer/client/mapped_memory_unittest.cc b/gpu/command_buffer/client/mapped_memory_unittest.cc index a7dcf9e901..2f3a9e73c6 100644 --- a/gpu/command_buffer/client/mapped_memory_unittest.cc +++ b/gpu/command_buffer/client/mapped_memory_unittest.cc @@ -268,16 +268,6 @@ TEST_F(MappedMemoryManagerTest, FreePendingToken) { } } -// Check if we don't free we don't crash. -TEST_F(MappedMemoryManagerTest, DontFree) { - const unsigned int kSize = 1024; - // Check we can alloc. - int32 id1 = -1; - unsigned int offset1 = 0xFFFFFFFFU; - void* mem1 = manager_->Alloc(kSize, &id1, &offset1); - ASSERT_TRUE(mem1); -} - TEST_F(MappedMemoryManagerTest, FreeUnused) { int32 id = -1; unsigned int offset = 0xFFFFFFFFU; @@ -321,6 +311,10 @@ TEST_F(MappedMemoryManagerTest, ChunkSizeMultiple) { EXPECT_EQ(0u, offset1); EXPECT_EQ(kSize, offset2); EXPECT_EQ(0u, offset3); + + manager_->Free(mem1); + manager_->Free(mem2); + manager_->Free(mem3); } TEST_F(MappedMemoryManagerTest, UnusedMemoryLimit) { @@ -350,6 +344,9 @@ TEST_F(MappedMemoryManagerTest, UnusedMemoryLimit) { // Expect two chunks to be allocated, exceeding the limit, // since all memory is in use. EXPECT_EQ(2 * kChunkSize, manager_->allocated_memory()); + + manager_->Free(mem1); + manager_->Free(mem2); } TEST_F(MappedMemoryManagerTest, MemoryLimitWithReuse) { @@ -400,6 +397,9 @@ TEST_F(MappedMemoryManagerTest, MemoryLimitWithReuse) { // Expect one chunk to be allocated EXPECT_EQ(1 * kChunkSize, manager_->allocated_memory()); + + manager_->Free(mem1); + manager_->Free(mem3); } namespace { diff --git a/gpu/command_buffer/cmd_buffer_functions.txt b/gpu/command_buffer/cmd_buffer_functions.txt index 0c20a5bd63..3e38cbd478 100644 --- a/gpu/command_buffer/cmd_buffer_functions.txt +++ b/gpu/command_buffer/cmd_buffer_functions.txt @@ -215,7 +215,7 @@ GL_APICALL void GL_APIENTRY glAsyncTexImage2DCHROMIUM (GLenumTextureTarg GL_APICALL void GL_APIENTRY glWaitAsyncTexImage2DCHROMIUM (GLenumTextureTarget target); GL_APICALL void GL_APIENTRY glWaitAllAsyncTexImage2DCHROMIUM (void); GL_APICALL void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei count, const GLenum* attachments); -GL_APICALL void GL_APIENTRY glLoseContextCHROMIUM (GLenum current, GLenum other); +GL_APICALL void GL_APIENTRY glLoseContextCHROMIUM (GLenumResetStatus current, GLenumResetStatus other); GL_APICALL GLuint GL_APIENTRY glInsertSyncPointCHROMIUM (void); GL_APICALL void GL_APIENTRY glWaitSyncPointCHROMIUM (GLuint sync_point); GL_APICALL void GL_APIENTRY glDrawBuffersEXT (GLsizei count, const GLenum* bufs); diff --git a/gpu/command_buffer/common/BUILD.gn b/gpu/command_buffer/common/BUILD.gn new file mode 100644 index 0000000000..43b19402bc --- /dev/null +++ b/gpu/command_buffer/common/BUILD.gn @@ -0,0 +1,42 @@ +# Copyright (c) 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("common") { + sources = [ + "bitfield_helpers.h", + "buffer.cc", + "buffer.h", + "capabilities.cc", + "capabilities.h", + "cmd_buffer_common.cc", + "cmd_buffer_common.h", + "command_buffer.h", + "constants.h", + "debug_marker_manager.cc", + "debug_marker_manager.h", + "gles2_cmd_format.cc", + "gles2_cmd_format.h", + "gles2_cmd_format.h", + "gles2_cmd_format_autogen.h", + "gles2_cmd_ids.h", + "gles2_cmd_ids_autogen.h", + "gles2_cmd_utils.cc", + "gles2_cmd_utils.h", + "gles2_utils_export.h", + "id_allocator.cc", + "id_allocator.h", + "mailbox.cc", + "mailbox.h", + "mailbox_holder.cc", + "mailbox_holder.h", + "thread_local.h", + "time.h", + ] + + all_dependent_configs = [ "//third_party/khronos:khronos_headers" ] + + deps = [ + "//base", + ] +} diff --git a/gpu/command_buffer/common/gles2_cmd_format.h b/gpu/command_buffer/common/gles2_cmd_format.h index 79baf9774d..a541cbb09e 100644 --- a/gpu/command_buffer/common/gles2_cmd_format.h +++ b/gpu/command_buffer/common/gles2_cmd_format.h @@ -14,6 +14,7 @@ #include <string.h> #include "base/atomicops.h" +#include "base/logging.h" #include "base/macros.h" #include "gpu/command_buffer/common/bitfield_helpers.h" #include "gpu/command_buffer/common/cmd_buffer_common.h" diff --git a/gpu/command_buffer/common/gles2_cmd_format_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_autogen.h index 94616287d2..c3b62dc8b3 100644 --- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h +++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h @@ -932,7 +932,6 @@ struct CompressedTexImage2D { GLenum _internalformat, GLsizei _width, GLsizei _height, - GLint _border, GLsizei _imageSize, uint32_t _data_shm_id, uint32_t _data_shm_offset) { @@ -942,7 +941,6 @@ struct CompressedTexImage2D { internalformat = _internalformat; width = _width; height = _height; - border = _border; imageSize = _imageSize; data_shm_id = _data_shm_id; data_shm_offset = _data_shm_offset; @@ -954,7 +952,6 @@ struct CompressedTexImage2D { GLenum _internalformat, GLsizei _width, GLsizei _height, - GLint _border, GLsizei _imageSize, uint32_t _data_shm_id, uint32_t _data_shm_offset) { @@ -963,7 +960,6 @@ struct CompressedTexImage2D { _internalformat, _width, _height, - _border, _imageSize, _data_shm_id, _data_shm_offset); @@ -976,14 +972,14 @@ struct CompressedTexImage2D { uint32_t internalformat; int32_t width; int32_t height; - int32_t border; int32_t imageSize; uint32_t data_shm_id; uint32_t data_shm_offset; + static const int32_t border = 0; }; -COMPILE_ASSERT(sizeof(CompressedTexImage2D) == 40, - Sizeof_CompressedTexImage2D_is_not_40); +COMPILE_ASSERT(sizeof(CompressedTexImage2D) == 36, + Sizeof_CompressedTexImage2D_is_not_36); COMPILE_ASSERT(offsetof(CompressedTexImage2D, header) == 0, OffsetOf_CompressedTexImage2D_header_not_0); COMPILE_ASSERT(offsetof(CompressedTexImage2D, target) == 4, @@ -996,14 +992,12 @@ COMPILE_ASSERT(offsetof(CompressedTexImage2D, width) == 16, OffsetOf_CompressedTexImage2D_width_not_16); COMPILE_ASSERT(offsetof(CompressedTexImage2D, height) == 20, OffsetOf_CompressedTexImage2D_height_not_20); -COMPILE_ASSERT(offsetof(CompressedTexImage2D, border) == 24, - OffsetOf_CompressedTexImage2D_border_not_24); -COMPILE_ASSERT(offsetof(CompressedTexImage2D, imageSize) == 28, - OffsetOf_CompressedTexImage2D_imageSize_not_28); -COMPILE_ASSERT(offsetof(CompressedTexImage2D, data_shm_id) == 32, - OffsetOf_CompressedTexImage2D_data_shm_id_not_32); -COMPILE_ASSERT(offsetof(CompressedTexImage2D, data_shm_offset) == 36, - OffsetOf_CompressedTexImage2D_data_shm_offset_not_36); +COMPILE_ASSERT(offsetof(CompressedTexImage2D, imageSize) == 24, + OffsetOf_CompressedTexImage2D_imageSize_not_24); +COMPILE_ASSERT(offsetof(CompressedTexImage2D, data_shm_id) == 28, + OffsetOf_CompressedTexImage2D_data_shm_id_not_28); +COMPILE_ASSERT(offsetof(CompressedTexImage2D, data_shm_offset) == 32, + OffsetOf_CompressedTexImage2D_data_shm_offset_not_32); struct CompressedTexImage2DBucket { typedef CompressedTexImage2DBucket ValueType; @@ -1022,7 +1016,6 @@ struct CompressedTexImage2DBucket { GLenum _internalformat, GLsizei _width, GLsizei _height, - GLint _border, GLuint _bucket_id) { SetHeader(); target = _target; @@ -1030,7 +1023,6 @@ struct CompressedTexImage2DBucket { internalformat = _internalformat; width = _width; height = _height; - border = _border; bucket_id = _bucket_id; } @@ -1040,10 +1032,9 @@ struct CompressedTexImage2DBucket { GLenum _internalformat, GLsizei _width, GLsizei _height, - GLint _border, GLuint _bucket_id) { - static_cast<ValueType*>(cmd)->Init( - _target, _level, _internalformat, _width, _height, _border, _bucket_id); + static_cast<ValueType*>(cmd) + ->Init(_target, _level, _internalformat, _width, _height, _bucket_id); return NextCmdAddress<ValueType>(cmd); } @@ -1053,12 +1044,12 @@ struct CompressedTexImage2DBucket { uint32_t internalformat; int32_t width; int32_t height; - int32_t border; uint32_t bucket_id; + static const int32_t border = 0; }; -COMPILE_ASSERT(sizeof(CompressedTexImage2DBucket) == 32, - Sizeof_CompressedTexImage2DBucket_is_not_32); +COMPILE_ASSERT(sizeof(CompressedTexImage2DBucket) == 28, + Sizeof_CompressedTexImage2DBucket_is_not_28); COMPILE_ASSERT(offsetof(CompressedTexImage2DBucket, header) == 0, OffsetOf_CompressedTexImage2DBucket_header_not_0); COMPILE_ASSERT(offsetof(CompressedTexImage2DBucket, target) == 4, @@ -1071,10 +1062,8 @@ COMPILE_ASSERT(offsetof(CompressedTexImage2DBucket, width) == 16, OffsetOf_CompressedTexImage2DBucket_width_not_16); COMPILE_ASSERT(offsetof(CompressedTexImage2DBucket, height) == 20, OffsetOf_CompressedTexImage2DBucket_height_not_20); -COMPILE_ASSERT(offsetof(CompressedTexImage2DBucket, border) == 24, - OffsetOf_CompressedTexImage2DBucket_border_not_24); -COMPILE_ASSERT(offsetof(CompressedTexImage2DBucket, bucket_id) == 28, - OffsetOf_CompressedTexImage2DBucket_bucket_id_not_28); +COMPILE_ASSERT(offsetof(CompressedTexImage2DBucket, bucket_id) == 24, + OffsetOf_CompressedTexImage2DBucket_bucket_id_not_24); struct CompressedTexSubImage2D { typedef CompressedTexSubImage2D ValueType; @@ -1274,8 +1263,7 @@ struct CopyTexImage2D { GLint _x, GLint _y, GLsizei _width, - GLsizei _height, - GLint _border) { + GLsizei _height) { SetHeader(); target = _target; level = _level; @@ -1284,7 +1272,6 @@ struct CopyTexImage2D { y = _y; width = _width; height = _height; - border = _border; } void* Set(void* cmd, @@ -1294,10 +1281,9 @@ struct CopyTexImage2D { GLint _x, GLint _y, GLsizei _width, - GLsizei _height, - GLint _border) { - static_cast<ValueType*>(cmd)->Init( - _target, _level, _internalformat, _x, _y, _width, _height, _border); + GLsizei _height) { + static_cast<ValueType*>(cmd) + ->Init(_target, _level, _internalformat, _x, _y, _width, _height); return NextCmdAddress<ValueType>(cmd); } @@ -1309,10 +1295,10 @@ struct CopyTexImage2D { int32_t y; int32_t width; int32_t height; - int32_t border; + static const int32_t border = 0; }; -COMPILE_ASSERT(sizeof(CopyTexImage2D) == 36, Sizeof_CopyTexImage2D_is_not_36); +COMPILE_ASSERT(sizeof(CopyTexImage2D) == 32, Sizeof_CopyTexImage2D_is_not_32); COMPILE_ASSERT(offsetof(CopyTexImage2D, header) == 0, OffsetOf_CopyTexImage2D_header_not_0); COMPILE_ASSERT(offsetof(CopyTexImage2D, target) == 4, @@ -1329,8 +1315,6 @@ COMPILE_ASSERT(offsetof(CopyTexImage2D, width) == 24, OffsetOf_CopyTexImage2D_width_not_24); COMPILE_ASSERT(offsetof(CopyTexImage2D, height) == 28, OffsetOf_CopyTexImage2D_height_not_28); -COMPILE_ASSERT(offsetof(CopyTexImage2D, border) == 32, - OffsetOf_CopyTexImage2D_border_not_32); struct CopyTexSubImage2D { typedef CopyTexSubImage2D ValueType; @@ -1507,51 +1491,6 @@ COMPILE_ASSERT(sizeof(CullFace) == 8, Sizeof_CullFace_is_not_8); COMPILE_ASSERT(offsetof(CullFace, header) == 0, OffsetOf_CullFace_header_not_0); COMPILE_ASSERT(offsetof(CullFace, mode) == 4, OffsetOf_CullFace_mode_not_4); -struct DeleteBuffers { - typedef DeleteBuffers ValueType; - static const CommandId kCmdId = kDeleteBuffers; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _n, - uint32_t _buffers_shm_id, - uint32_t _buffers_shm_offset) { - SetHeader(); - n = _n; - buffers_shm_id = _buffers_shm_id; - buffers_shm_offset = _buffers_shm_offset; - } - - void* Set(void* cmd, - GLsizei _n, - uint32_t _buffers_shm_id, - uint32_t _buffers_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_n, _buffers_shm_id, _buffers_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t n; - uint32_t buffers_shm_id; - uint32_t buffers_shm_offset; -}; - -COMPILE_ASSERT(sizeof(DeleteBuffers) == 16, Sizeof_DeleteBuffers_is_not_16); -COMPILE_ASSERT(offsetof(DeleteBuffers, header) == 0, - OffsetOf_DeleteBuffers_header_not_0); -COMPILE_ASSERT(offsetof(DeleteBuffers, n) == 4, OffsetOf_DeleteBuffers_n_not_4); -COMPILE_ASSERT(offsetof(DeleteBuffers, buffers_shm_id) == 8, - OffsetOf_DeleteBuffers_buffers_shm_id_not_8); -COMPILE_ASSERT(offsetof(DeleteBuffers, buffers_shm_offset) == 12, - OffsetOf_DeleteBuffers_buffers_shm_offset_not_12); - struct DeleteBuffersImmediate { typedef DeleteBuffersImmediate ValueType; static const CommandId kCmdId = kDeleteBuffersImmediate; @@ -1594,53 +1533,6 @@ COMPILE_ASSERT(offsetof(DeleteBuffersImmediate, header) == 0, COMPILE_ASSERT(offsetof(DeleteBuffersImmediate, n) == 4, OffsetOf_DeleteBuffersImmediate_n_not_4); -struct DeleteFramebuffers { - typedef DeleteFramebuffers ValueType; - static const CommandId kCmdId = kDeleteFramebuffers; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _n, - uint32_t _framebuffers_shm_id, - uint32_t _framebuffers_shm_offset) { - SetHeader(); - n = _n; - framebuffers_shm_id = _framebuffers_shm_id; - framebuffers_shm_offset = _framebuffers_shm_offset; - } - - void* Set(void* cmd, - GLsizei _n, - uint32_t _framebuffers_shm_id, - uint32_t _framebuffers_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_n, _framebuffers_shm_id, _framebuffers_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t n; - uint32_t framebuffers_shm_id; - uint32_t framebuffers_shm_offset; -}; - -COMPILE_ASSERT(sizeof(DeleteFramebuffers) == 16, - Sizeof_DeleteFramebuffers_is_not_16); -COMPILE_ASSERT(offsetof(DeleteFramebuffers, header) == 0, - OffsetOf_DeleteFramebuffers_header_not_0); -COMPILE_ASSERT(offsetof(DeleteFramebuffers, n) == 4, - OffsetOf_DeleteFramebuffers_n_not_4); -COMPILE_ASSERT(offsetof(DeleteFramebuffers, framebuffers_shm_id) == 8, - OffsetOf_DeleteFramebuffers_framebuffers_shm_id_not_8); -COMPILE_ASSERT(offsetof(DeleteFramebuffers, framebuffers_shm_offset) == 12, - OffsetOf_DeleteFramebuffers_framebuffers_shm_offset_not_12); - struct DeleteFramebuffersImmediate { typedef DeleteFramebuffersImmediate ValueType; static const CommandId kCmdId = kDeleteFramebuffersImmediate; @@ -1715,53 +1607,6 @@ COMPILE_ASSERT(offsetof(DeleteProgram, header) == 0, COMPILE_ASSERT(offsetof(DeleteProgram, program) == 4, OffsetOf_DeleteProgram_program_not_4); -struct DeleteRenderbuffers { - typedef DeleteRenderbuffers ValueType; - static const CommandId kCmdId = kDeleteRenderbuffers; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _n, - uint32_t _renderbuffers_shm_id, - uint32_t _renderbuffers_shm_offset) { - SetHeader(); - n = _n; - renderbuffers_shm_id = _renderbuffers_shm_id; - renderbuffers_shm_offset = _renderbuffers_shm_offset; - } - - void* Set(void* cmd, - GLsizei _n, - uint32_t _renderbuffers_shm_id, - uint32_t _renderbuffers_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_n, _renderbuffers_shm_id, _renderbuffers_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t n; - uint32_t renderbuffers_shm_id; - uint32_t renderbuffers_shm_offset; -}; - -COMPILE_ASSERT(sizeof(DeleteRenderbuffers) == 16, - Sizeof_DeleteRenderbuffers_is_not_16); -COMPILE_ASSERT(offsetof(DeleteRenderbuffers, header) == 0, - OffsetOf_DeleteRenderbuffers_header_not_0); -COMPILE_ASSERT(offsetof(DeleteRenderbuffers, n) == 4, - OffsetOf_DeleteRenderbuffers_n_not_4); -COMPILE_ASSERT(offsetof(DeleteRenderbuffers, renderbuffers_shm_id) == 8, - OffsetOf_DeleteRenderbuffers_renderbuffers_shm_id_not_8); -COMPILE_ASSERT(offsetof(DeleteRenderbuffers, renderbuffers_shm_offset) == 12, - OffsetOf_DeleteRenderbuffers_renderbuffers_shm_offset_not_12); - struct DeleteRenderbuffersImmediate { typedef DeleteRenderbuffersImmediate ValueType; static const CommandId kCmdId = kDeleteRenderbuffersImmediate; @@ -1836,52 +1681,6 @@ COMPILE_ASSERT(offsetof(DeleteShader, header) == 0, COMPILE_ASSERT(offsetof(DeleteShader, shader) == 4, OffsetOf_DeleteShader_shader_not_4); -struct DeleteTextures { - typedef DeleteTextures ValueType; - static const CommandId kCmdId = kDeleteTextures; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _n, - uint32_t _textures_shm_id, - uint32_t _textures_shm_offset) { - SetHeader(); - n = _n; - textures_shm_id = _textures_shm_id; - textures_shm_offset = _textures_shm_offset; - } - - void* Set(void* cmd, - GLsizei _n, - uint32_t _textures_shm_id, - uint32_t _textures_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_n, _textures_shm_id, _textures_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t n; - uint32_t textures_shm_id; - uint32_t textures_shm_offset; -}; - -COMPILE_ASSERT(sizeof(DeleteTextures) == 16, Sizeof_DeleteTextures_is_not_16); -COMPILE_ASSERT(offsetof(DeleteTextures, header) == 0, - OffsetOf_DeleteTextures_header_not_0); -COMPILE_ASSERT(offsetof(DeleteTextures, n) == 4, - OffsetOf_DeleteTextures_n_not_4); -COMPILE_ASSERT(offsetof(DeleteTextures, textures_shm_id) == 8, - OffsetOf_DeleteTextures_textures_shm_id_not_8); -COMPILE_ASSERT(offsetof(DeleteTextures, textures_shm_offset) == 12, - OffsetOf_DeleteTextures_textures_shm_offset_not_12); - struct DeleteTexturesImmediate { typedef DeleteTexturesImmediate ValueType; static const CommandId kCmdId = kDeleteTexturesImmediate; @@ -2389,24 +2188,21 @@ struct FramebufferTexture2D { void Init(GLenum _target, GLenum _attachment, GLenum _textarget, - GLuint _texture, - GLint _level) { + GLuint _texture) { SetHeader(); target = _target; attachment = _attachment; textarget = _textarget; texture = _texture; - level = _level; } void* Set(void* cmd, GLenum _target, GLenum _attachment, GLenum _textarget, - GLuint _texture, - GLint _level) { + GLuint _texture) { static_cast<ValueType*>(cmd) - ->Init(_target, _attachment, _textarget, _texture, _level); + ->Init(_target, _attachment, _textarget, _texture); return NextCmdAddress<ValueType>(cmd); } @@ -2415,11 +2211,11 @@ struct FramebufferTexture2D { uint32_t attachment; uint32_t textarget; uint32_t texture; - int32_t level; + static const int32_t level = 0; }; -COMPILE_ASSERT(sizeof(FramebufferTexture2D) == 24, - Sizeof_FramebufferTexture2D_is_not_24); +COMPILE_ASSERT(sizeof(FramebufferTexture2D) == 20, + Sizeof_FramebufferTexture2D_is_not_20); COMPILE_ASSERT(offsetof(FramebufferTexture2D, header) == 0, OffsetOf_FramebufferTexture2D_header_not_0); COMPILE_ASSERT(offsetof(FramebufferTexture2D, target) == 4, @@ -2430,8 +2226,6 @@ COMPILE_ASSERT(offsetof(FramebufferTexture2D, textarget) == 12, OffsetOf_FramebufferTexture2D_textarget_not_12); COMPILE_ASSERT(offsetof(FramebufferTexture2D, texture) == 16, OffsetOf_FramebufferTexture2D_texture_not_16); -COMPILE_ASSERT(offsetof(FramebufferTexture2D, level) == 20, - OffsetOf_FramebufferTexture2D_level_not_20); struct FrontFace { typedef FrontFace ValueType; @@ -2464,51 +2258,6 @@ COMPILE_ASSERT(offsetof(FrontFace, header) == 0, OffsetOf_FrontFace_header_not_0); COMPILE_ASSERT(offsetof(FrontFace, mode) == 4, OffsetOf_FrontFace_mode_not_4); -struct GenBuffers { - typedef GenBuffers ValueType; - static const CommandId kCmdId = kGenBuffers; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _n, - uint32_t _buffers_shm_id, - uint32_t _buffers_shm_offset) { - SetHeader(); - n = _n; - buffers_shm_id = _buffers_shm_id; - buffers_shm_offset = _buffers_shm_offset; - } - - void* Set(void* cmd, - GLsizei _n, - uint32_t _buffers_shm_id, - uint32_t _buffers_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_n, _buffers_shm_id, _buffers_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t n; - uint32_t buffers_shm_id; - uint32_t buffers_shm_offset; -}; - -COMPILE_ASSERT(sizeof(GenBuffers) == 16, Sizeof_GenBuffers_is_not_16); -COMPILE_ASSERT(offsetof(GenBuffers, header) == 0, - OffsetOf_GenBuffers_header_not_0); -COMPILE_ASSERT(offsetof(GenBuffers, n) == 4, OffsetOf_GenBuffers_n_not_4); -COMPILE_ASSERT(offsetof(GenBuffers, buffers_shm_id) == 8, - OffsetOf_GenBuffers_buffers_shm_id_not_8); -COMPILE_ASSERT(offsetof(GenBuffers, buffers_shm_offset) == 12, - OffsetOf_GenBuffers_buffers_shm_offset_not_12); - struct GenBuffersImmediate { typedef GenBuffersImmediate ValueType; static const CommandId kCmdId = kGenBuffersImmediate; @@ -2583,52 +2332,6 @@ COMPILE_ASSERT(offsetof(GenerateMipmap, header) == 0, COMPILE_ASSERT(offsetof(GenerateMipmap, target) == 4, OffsetOf_GenerateMipmap_target_not_4); -struct GenFramebuffers { - typedef GenFramebuffers ValueType; - static const CommandId kCmdId = kGenFramebuffers; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _n, - uint32_t _framebuffers_shm_id, - uint32_t _framebuffers_shm_offset) { - SetHeader(); - n = _n; - framebuffers_shm_id = _framebuffers_shm_id; - framebuffers_shm_offset = _framebuffers_shm_offset; - } - - void* Set(void* cmd, - GLsizei _n, - uint32_t _framebuffers_shm_id, - uint32_t _framebuffers_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_n, _framebuffers_shm_id, _framebuffers_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t n; - uint32_t framebuffers_shm_id; - uint32_t framebuffers_shm_offset; -}; - -COMPILE_ASSERT(sizeof(GenFramebuffers) == 16, Sizeof_GenFramebuffers_is_not_16); -COMPILE_ASSERT(offsetof(GenFramebuffers, header) == 0, - OffsetOf_GenFramebuffers_header_not_0); -COMPILE_ASSERT(offsetof(GenFramebuffers, n) == 4, - OffsetOf_GenFramebuffers_n_not_4); -COMPILE_ASSERT(offsetof(GenFramebuffers, framebuffers_shm_id) == 8, - OffsetOf_GenFramebuffers_framebuffers_shm_id_not_8); -COMPILE_ASSERT(offsetof(GenFramebuffers, framebuffers_shm_offset) == 12, - OffsetOf_GenFramebuffers_framebuffers_shm_offset_not_12); - struct GenFramebuffersImmediate { typedef GenFramebuffersImmediate ValueType; static const CommandId kCmdId = kGenFramebuffersImmediate; @@ -2671,53 +2374,6 @@ COMPILE_ASSERT(offsetof(GenFramebuffersImmediate, header) == 0, COMPILE_ASSERT(offsetof(GenFramebuffersImmediate, n) == 4, OffsetOf_GenFramebuffersImmediate_n_not_4); -struct GenRenderbuffers { - typedef GenRenderbuffers ValueType; - static const CommandId kCmdId = kGenRenderbuffers; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _n, - uint32_t _renderbuffers_shm_id, - uint32_t _renderbuffers_shm_offset) { - SetHeader(); - n = _n; - renderbuffers_shm_id = _renderbuffers_shm_id; - renderbuffers_shm_offset = _renderbuffers_shm_offset; - } - - void* Set(void* cmd, - GLsizei _n, - uint32_t _renderbuffers_shm_id, - uint32_t _renderbuffers_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_n, _renderbuffers_shm_id, _renderbuffers_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t n; - uint32_t renderbuffers_shm_id; - uint32_t renderbuffers_shm_offset; -}; - -COMPILE_ASSERT(sizeof(GenRenderbuffers) == 16, - Sizeof_GenRenderbuffers_is_not_16); -COMPILE_ASSERT(offsetof(GenRenderbuffers, header) == 0, - OffsetOf_GenRenderbuffers_header_not_0); -COMPILE_ASSERT(offsetof(GenRenderbuffers, n) == 4, - OffsetOf_GenRenderbuffers_n_not_4); -COMPILE_ASSERT(offsetof(GenRenderbuffers, renderbuffers_shm_id) == 8, - OffsetOf_GenRenderbuffers_renderbuffers_shm_id_not_8); -COMPILE_ASSERT(offsetof(GenRenderbuffers, renderbuffers_shm_offset) == 12, - OffsetOf_GenRenderbuffers_renderbuffers_shm_offset_not_12); - struct GenRenderbuffersImmediate { typedef GenRenderbuffersImmediate ValueType; static const CommandId kCmdId = kGenRenderbuffersImmediate; @@ -2760,51 +2416,6 @@ COMPILE_ASSERT(offsetof(GenRenderbuffersImmediate, header) == 0, COMPILE_ASSERT(offsetof(GenRenderbuffersImmediate, n) == 4, OffsetOf_GenRenderbuffersImmediate_n_not_4); -struct GenTextures { - typedef GenTextures ValueType; - static const CommandId kCmdId = kGenTextures; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _n, - uint32_t _textures_shm_id, - uint32_t _textures_shm_offset) { - SetHeader(); - n = _n; - textures_shm_id = _textures_shm_id; - textures_shm_offset = _textures_shm_offset; - } - - void* Set(void* cmd, - GLsizei _n, - uint32_t _textures_shm_id, - uint32_t _textures_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_n, _textures_shm_id, _textures_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t n; - uint32_t textures_shm_id; - uint32_t textures_shm_offset; -}; - -COMPILE_ASSERT(sizeof(GenTextures) == 16, Sizeof_GenTextures_is_not_16); -COMPILE_ASSERT(offsetof(GenTextures, header) == 0, - OffsetOf_GenTextures_header_not_0); -COMPILE_ASSERT(offsetof(GenTextures, n) == 4, OffsetOf_GenTextures_n_not_4); -COMPILE_ASSERT(offsetof(GenTextures, textures_shm_id) == 8, - OffsetOf_GenTextures_textures_shm_id_not_8); -COMPILE_ASSERT(offsetof(GenTextures, textures_shm_offset) == 12, - OffsetOf_GenTextures_textures_shm_offset_not_12); - struct GenTexturesImmediate { typedef GenTexturesImmediate ValueType; static const CommandId kCmdId = kGenTexturesImmediate; @@ -5278,7 +4889,6 @@ struct TexImage2D { GLint _internalformat, GLsizei _width, GLsizei _height, - GLint _border, GLenum _format, GLenum _type, uint32_t _pixels_shm_id, @@ -5289,7 +4899,6 @@ struct TexImage2D { internalformat = _internalformat; width = _width; height = _height; - border = _border; format = _format; type = _type; pixels_shm_id = _pixels_shm_id; @@ -5302,7 +4911,6 @@ struct TexImage2D { GLint _internalformat, GLsizei _width, GLsizei _height, - GLint _border, GLenum _format, GLenum _type, uint32_t _pixels_shm_id, @@ -5312,7 +4920,6 @@ struct TexImage2D { _internalformat, _width, _height, - _border, _format, _type, _pixels_shm_id, @@ -5326,14 +4933,14 @@ struct TexImage2D { int32_t internalformat; int32_t width; int32_t height; - int32_t border; uint32_t format; uint32_t type; uint32_t pixels_shm_id; uint32_t pixels_shm_offset; + static const int32_t border = 0; }; -COMPILE_ASSERT(sizeof(TexImage2D) == 44, Sizeof_TexImage2D_is_not_44); +COMPILE_ASSERT(sizeof(TexImage2D) == 40, Sizeof_TexImage2D_is_not_40); COMPILE_ASSERT(offsetof(TexImage2D, header) == 0, OffsetOf_TexImage2D_header_not_0); COMPILE_ASSERT(offsetof(TexImage2D, target) == 4, @@ -5346,16 +4953,14 @@ COMPILE_ASSERT(offsetof(TexImage2D, width) == 16, OffsetOf_TexImage2D_width_not_16); COMPILE_ASSERT(offsetof(TexImage2D, height) == 20, OffsetOf_TexImage2D_height_not_20); -COMPILE_ASSERT(offsetof(TexImage2D, border) == 24, - OffsetOf_TexImage2D_border_not_24); -COMPILE_ASSERT(offsetof(TexImage2D, format) == 28, - OffsetOf_TexImage2D_format_not_28); -COMPILE_ASSERT(offsetof(TexImage2D, type) == 32, - OffsetOf_TexImage2D_type_not_32); -COMPILE_ASSERT(offsetof(TexImage2D, pixels_shm_id) == 36, - OffsetOf_TexImage2D_pixels_shm_id_not_36); -COMPILE_ASSERT(offsetof(TexImage2D, pixels_shm_offset) == 40, - OffsetOf_TexImage2D_pixels_shm_offset_not_40); +COMPILE_ASSERT(offsetof(TexImage2D, format) == 24, + OffsetOf_TexImage2D_format_not_24); +COMPILE_ASSERT(offsetof(TexImage2D, type) == 28, + OffsetOf_TexImage2D_type_not_28); +COMPILE_ASSERT(offsetof(TexImage2D, pixels_shm_id) == 32, + OffsetOf_TexImage2D_pixels_shm_id_not_32); +COMPILE_ASSERT(offsetof(TexImage2D, pixels_shm_offset) == 36, + OffsetOf_TexImage2D_pixels_shm_offset_not_36); struct TexParameterf { typedef TexParameterf ValueType; @@ -5397,58 +5002,6 @@ COMPILE_ASSERT(offsetof(TexParameterf, pname) == 8, COMPILE_ASSERT(offsetof(TexParameterf, param) == 12, OffsetOf_TexParameterf_param_not_12); -struct TexParameterfv { - typedef TexParameterfv ValueType; - static const CommandId kCmdId = kTexParameterfv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLenum _target, - GLenum _pname, - uint32_t _params_shm_id, - uint32_t _params_shm_offset) { - SetHeader(); - target = _target; - pname = _pname; - params_shm_id = _params_shm_id; - params_shm_offset = _params_shm_offset; - } - - void* Set(void* cmd, - GLenum _target, - GLenum _pname, - uint32_t _params_shm_id, - uint32_t _params_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_target, _pname, _params_shm_id, _params_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - uint32_t target; - uint32_t pname; - uint32_t params_shm_id; - uint32_t params_shm_offset; -}; - -COMPILE_ASSERT(sizeof(TexParameterfv) == 20, Sizeof_TexParameterfv_is_not_20); -COMPILE_ASSERT(offsetof(TexParameterfv, header) == 0, - OffsetOf_TexParameterfv_header_not_0); -COMPILE_ASSERT(offsetof(TexParameterfv, target) == 4, - OffsetOf_TexParameterfv_target_not_4); -COMPILE_ASSERT(offsetof(TexParameterfv, pname) == 8, - OffsetOf_TexParameterfv_pname_not_8); -COMPILE_ASSERT(offsetof(TexParameterfv, params_shm_id) == 12, - OffsetOf_TexParameterfv_params_shm_id_not_12); -COMPILE_ASSERT(offsetof(TexParameterfv, params_shm_offset) == 16, - OffsetOf_TexParameterfv_params_shm_offset_not_16); - struct TexParameterfvImmediate { typedef TexParameterfvImmediate ValueType; static const CommandId kCmdId = kTexParameterfvImmediate; @@ -5533,58 +5086,6 @@ COMPILE_ASSERT(offsetof(TexParameteri, pname) == 8, COMPILE_ASSERT(offsetof(TexParameteri, param) == 12, OffsetOf_TexParameteri_param_not_12); -struct TexParameteriv { - typedef TexParameteriv ValueType; - static const CommandId kCmdId = kTexParameteriv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLenum _target, - GLenum _pname, - uint32_t _params_shm_id, - uint32_t _params_shm_offset) { - SetHeader(); - target = _target; - pname = _pname; - params_shm_id = _params_shm_id; - params_shm_offset = _params_shm_offset; - } - - void* Set(void* cmd, - GLenum _target, - GLenum _pname, - uint32_t _params_shm_id, - uint32_t _params_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_target, _pname, _params_shm_id, _params_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - uint32_t target; - uint32_t pname; - uint32_t params_shm_id; - uint32_t params_shm_offset; -}; - -COMPILE_ASSERT(sizeof(TexParameteriv) == 20, Sizeof_TexParameteriv_is_not_20); -COMPILE_ASSERT(offsetof(TexParameteriv, header) == 0, - OffsetOf_TexParameteriv_header_not_0); -COMPILE_ASSERT(offsetof(TexParameteriv, target) == 4, - OffsetOf_TexParameteriv_target_not_4); -COMPILE_ASSERT(offsetof(TexParameteriv, pname) == 8, - OffsetOf_TexParameteriv_pname_not_8); -COMPILE_ASSERT(offsetof(TexParameteriv, params_shm_id) == 12, - OffsetOf_TexParameteriv_params_shm_id_not_12); -COMPILE_ASSERT(offsetof(TexParameteriv, params_shm_offset) == 16, - OffsetOf_TexParameteriv_params_shm_offset_not_16); - struct TexParameterivImmediate { typedef TexParameterivImmediate ValueType; static const CommandId kCmdId = kTexParameterivImmediate; @@ -5767,58 +5268,6 @@ COMPILE_ASSERT(offsetof(Uniform1f, location) == 4, OffsetOf_Uniform1f_location_not_4); COMPILE_ASSERT(offsetof(Uniform1f, x) == 8, OffsetOf_Uniform1f_x_not_8); -struct Uniform1fv { - typedef Uniform1fv ValueType; - static const CommandId kCmdId = kUniform1fv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - SetHeader(); - location = _location; - count = _count; - v_shm_id = _v_shm_id; - v_shm_offset = _v_shm_offset; - } - - void* Set(void* cmd, - GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_location, _count, _v_shm_id, _v_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t location; - int32_t count; - uint32_t v_shm_id; - uint32_t v_shm_offset; -}; - -COMPILE_ASSERT(sizeof(Uniform1fv) == 20, Sizeof_Uniform1fv_is_not_20); -COMPILE_ASSERT(offsetof(Uniform1fv, header) == 0, - OffsetOf_Uniform1fv_header_not_0); -COMPILE_ASSERT(offsetof(Uniform1fv, location) == 4, - OffsetOf_Uniform1fv_location_not_4); -COMPILE_ASSERT(offsetof(Uniform1fv, count) == 8, - OffsetOf_Uniform1fv_count_not_8); -COMPILE_ASSERT(offsetof(Uniform1fv, v_shm_id) == 12, - OffsetOf_Uniform1fv_v_shm_id_not_12); -COMPILE_ASSERT(offsetof(Uniform1fv, v_shm_offset) == 16, - OffsetOf_Uniform1fv_v_shm_offset_not_16); - struct Uniform1fvImmediate { typedef Uniform1fvImmediate ValueType; static const CommandId kCmdId = kUniform1fvImmediate; @@ -5900,58 +5349,6 @@ COMPILE_ASSERT(offsetof(Uniform1i, location) == 4, OffsetOf_Uniform1i_location_not_4); COMPILE_ASSERT(offsetof(Uniform1i, x) == 8, OffsetOf_Uniform1i_x_not_8); -struct Uniform1iv { - typedef Uniform1iv ValueType; - static const CommandId kCmdId = kUniform1iv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - SetHeader(); - location = _location; - count = _count; - v_shm_id = _v_shm_id; - v_shm_offset = _v_shm_offset; - } - - void* Set(void* cmd, - GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_location, _count, _v_shm_id, _v_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t location; - int32_t count; - uint32_t v_shm_id; - uint32_t v_shm_offset; -}; - -COMPILE_ASSERT(sizeof(Uniform1iv) == 20, Sizeof_Uniform1iv_is_not_20); -COMPILE_ASSERT(offsetof(Uniform1iv, header) == 0, - OffsetOf_Uniform1iv_header_not_0); -COMPILE_ASSERT(offsetof(Uniform1iv, location) == 4, - OffsetOf_Uniform1iv_location_not_4); -COMPILE_ASSERT(offsetof(Uniform1iv, count) == 8, - OffsetOf_Uniform1iv_count_not_8); -COMPILE_ASSERT(offsetof(Uniform1iv, v_shm_id) == 12, - OffsetOf_Uniform1iv_v_shm_id_not_12); -COMPILE_ASSERT(offsetof(Uniform1iv, v_shm_offset) == 16, - OffsetOf_Uniform1iv_v_shm_offset_not_16); - struct Uniform1ivImmediate { typedef Uniform1ivImmediate ValueType; static const CommandId kCmdId = kUniform1ivImmediate; @@ -6036,58 +5433,6 @@ COMPILE_ASSERT(offsetof(Uniform2f, location) == 4, COMPILE_ASSERT(offsetof(Uniform2f, x) == 8, OffsetOf_Uniform2f_x_not_8); COMPILE_ASSERT(offsetof(Uniform2f, y) == 12, OffsetOf_Uniform2f_y_not_12); -struct Uniform2fv { - typedef Uniform2fv ValueType; - static const CommandId kCmdId = kUniform2fv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - SetHeader(); - location = _location; - count = _count; - v_shm_id = _v_shm_id; - v_shm_offset = _v_shm_offset; - } - - void* Set(void* cmd, - GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_location, _count, _v_shm_id, _v_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t location; - int32_t count; - uint32_t v_shm_id; - uint32_t v_shm_offset; -}; - -COMPILE_ASSERT(sizeof(Uniform2fv) == 20, Sizeof_Uniform2fv_is_not_20); -COMPILE_ASSERT(offsetof(Uniform2fv, header) == 0, - OffsetOf_Uniform2fv_header_not_0); -COMPILE_ASSERT(offsetof(Uniform2fv, location) == 4, - OffsetOf_Uniform2fv_location_not_4); -COMPILE_ASSERT(offsetof(Uniform2fv, count) == 8, - OffsetOf_Uniform2fv_count_not_8); -COMPILE_ASSERT(offsetof(Uniform2fv, v_shm_id) == 12, - OffsetOf_Uniform2fv_v_shm_id_not_12); -COMPILE_ASSERT(offsetof(Uniform2fv, v_shm_offset) == 16, - OffsetOf_Uniform2fv_v_shm_offset_not_16); - struct Uniform2fvImmediate { typedef Uniform2fvImmediate ValueType; static const CommandId kCmdId = kUniform2fvImmediate; @@ -6172,58 +5517,6 @@ COMPILE_ASSERT(offsetof(Uniform2i, location) == 4, COMPILE_ASSERT(offsetof(Uniform2i, x) == 8, OffsetOf_Uniform2i_x_not_8); COMPILE_ASSERT(offsetof(Uniform2i, y) == 12, OffsetOf_Uniform2i_y_not_12); -struct Uniform2iv { - typedef Uniform2iv ValueType; - static const CommandId kCmdId = kUniform2iv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - SetHeader(); - location = _location; - count = _count; - v_shm_id = _v_shm_id; - v_shm_offset = _v_shm_offset; - } - - void* Set(void* cmd, - GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_location, _count, _v_shm_id, _v_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t location; - int32_t count; - uint32_t v_shm_id; - uint32_t v_shm_offset; -}; - -COMPILE_ASSERT(sizeof(Uniform2iv) == 20, Sizeof_Uniform2iv_is_not_20); -COMPILE_ASSERT(offsetof(Uniform2iv, header) == 0, - OffsetOf_Uniform2iv_header_not_0); -COMPILE_ASSERT(offsetof(Uniform2iv, location) == 4, - OffsetOf_Uniform2iv_location_not_4); -COMPILE_ASSERT(offsetof(Uniform2iv, count) == 8, - OffsetOf_Uniform2iv_count_not_8); -COMPILE_ASSERT(offsetof(Uniform2iv, v_shm_id) == 12, - OffsetOf_Uniform2iv_v_shm_id_not_12); -COMPILE_ASSERT(offsetof(Uniform2iv, v_shm_offset) == 16, - OffsetOf_Uniform2iv_v_shm_offset_not_16); - struct Uniform2ivImmediate { typedef Uniform2ivImmediate ValueType; static const CommandId kCmdId = kUniform2ivImmediate; @@ -6311,58 +5604,6 @@ COMPILE_ASSERT(offsetof(Uniform3f, x) == 8, OffsetOf_Uniform3f_x_not_8); COMPILE_ASSERT(offsetof(Uniform3f, y) == 12, OffsetOf_Uniform3f_y_not_12); COMPILE_ASSERT(offsetof(Uniform3f, z) == 16, OffsetOf_Uniform3f_z_not_16); -struct Uniform3fv { - typedef Uniform3fv ValueType; - static const CommandId kCmdId = kUniform3fv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - SetHeader(); - location = _location; - count = _count; - v_shm_id = _v_shm_id; - v_shm_offset = _v_shm_offset; - } - - void* Set(void* cmd, - GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_location, _count, _v_shm_id, _v_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t location; - int32_t count; - uint32_t v_shm_id; - uint32_t v_shm_offset; -}; - -COMPILE_ASSERT(sizeof(Uniform3fv) == 20, Sizeof_Uniform3fv_is_not_20); -COMPILE_ASSERT(offsetof(Uniform3fv, header) == 0, - OffsetOf_Uniform3fv_header_not_0); -COMPILE_ASSERT(offsetof(Uniform3fv, location) == 4, - OffsetOf_Uniform3fv_location_not_4); -COMPILE_ASSERT(offsetof(Uniform3fv, count) == 8, - OffsetOf_Uniform3fv_count_not_8); -COMPILE_ASSERT(offsetof(Uniform3fv, v_shm_id) == 12, - OffsetOf_Uniform3fv_v_shm_id_not_12); -COMPILE_ASSERT(offsetof(Uniform3fv, v_shm_offset) == 16, - OffsetOf_Uniform3fv_v_shm_offset_not_16); - struct Uniform3fvImmediate { typedef Uniform3fvImmediate ValueType; static const CommandId kCmdId = kUniform3fvImmediate; @@ -6450,58 +5691,6 @@ COMPILE_ASSERT(offsetof(Uniform3i, x) == 8, OffsetOf_Uniform3i_x_not_8); COMPILE_ASSERT(offsetof(Uniform3i, y) == 12, OffsetOf_Uniform3i_y_not_12); COMPILE_ASSERT(offsetof(Uniform3i, z) == 16, OffsetOf_Uniform3i_z_not_16); -struct Uniform3iv { - typedef Uniform3iv ValueType; - static const CommandId kCmdId = kUniform3iv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - SetHeader(); - location = _location; - count = _count; - v_shm_id = _v_shm_id; - v_shm_offset = _v_shm_offset; - } - - void* Set(void* cmd, - GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_location, _count, _v_shm_id, _v_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t location; - int32_t count; - uint32_t v_shm_id; - uint32_t v_shm_offset; -}; - -COMPILE_ASSERT(sizeof(Uniform3iv) == 20, Sizeof_Uniform3iv_is_not_20); -COMPILE_ASSERT(offsetof(Uniform3iv, header) == 0, - OffsetOf_Uniform3iv_header_not_0); -COMPILE_ASSERT(offsetof(Uniform3iv, location) == 4, - OffsetOf_Uniform3iv_location_not_4); -COMPILE_ASSERT(offsetof(Uniform3iv, count) == 8, - OffsetOf_Uniform3iv_count_not_8); -COMPILE_ASSERT(offsetof(Uniform3iv, v_shm_id) == 12, - OffsetOf_Uniform3iv_v_shm_id_not_12); -COMPILE_ASSERT(offsetof(Uniform3iv, v_shm_offset) == 16, - OffsetOf_Uniform3iv_v_shm_offset_not_16); - struct Uniform3ivImmediate { typedef Uniform3ivImmediate ValueType; static const CommandId kCmdId = kUniform3ivImmediate; @@ -6597,58 +5786,6 @@ COMPILE_ASSERT(offsetof(Uniform4f, y) == 12, OffsetOf_Uniform4f_y_not_12); COMPILE_ASSERT(offsetof(Uniform4f, z) == 16, OffsetOf_Uniform4f_z_not_16); COMPILE_ASSERT(offsetof(Uniform4f, w) == 20, OffsetOf_Uniform4f_w_not_20); -struct Uniform4fv { - typedef Uniform4fv ValueType; - static const CommandId kCmdId = kUniform4fv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - SetHeader(); - location = _location; - count = _count; - v_shm_id = _v_shm_id; - v_shm_offset = _v_shm_offset; - } - - void* Set(void* cmd, - GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_location, _count, _v_shm_id, _v_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t location; - int32_t count; - uint32_t v_shm_id; - uint32_t v_shm_offset; -}; - -COMPILE_ASSERT(sizeof(Uniform4fv) == 20, Sizeof_Uniform4fv_is_not_20); -COMPILE_ASSERT(offsetof(Uniform4fv, header) == 0, - OffsetOf_Uniform4fv_header_not_0); -COMPILE_ASSERT(offsetof(Uniform4fv, location) == 4, - OffsetOf_Uniform4fv_location_not_4); -COMPILE_ASSERT(offsetof(Uniform4fv, count) == 8, - OffsetOf_Uniform4fv_count_not_8); -COMPILE_ASSERT(offsetof(Uniform4fv, v_shm_id) == 12, - OffsetOf_Uniform4fv_v_shm_id_not_12); -COMPILE_ASSERT(offsetof(Uniform4fv, v_shm_offset) == 16, - OffsetOf_Uniform4fv_v_shm_offset_not_16); - struct Uniform4fvImmediate { typedef Uniform4fvImmediate ValueType; static const CommandId kCmdId = kUniform4fvImmediate; @@ -6744,58 +5881,6 @@ COMPILE_ASSERT(offsetof(Uniform4i, y) == 12, OffsetOf_Uniform4i_y_not_12); COMPILE_ASSERT(offsetof(Uniform4i, z) == 16, OffsetOf_Uniform4i_z_not_16); COMPILE_ASSERT(offsetof(Uniform4i, w) == 20, OffsetOf_Uniform4i_w_not_20); -struct Uniform4iv { - typedef Uniform4iv ValueType; - static const CommandId kCmdId = kUniform4iv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - SetHeader(); - location = _location; - count = _count; - v_shm_id = _v_shm_id; - v_shm_offset = _v_shm_offset; - } - - void* Set(void* cmd, - GLint _location, - GLsizei _count, - uint32_t _v_shm_id, - uint32_t _v_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_location, _count, _v_shm_id, _v_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t location; - int32_t count; - uint32_t v_shm_id; - uint32_t v_shm_offset; -}; - -COMPILE_ASSERT(sizeof(Uniform4iv) == 20, Sizeof_Uniform4iv_is_not_20); -COMPILE_ASSERT(offsetof(Uniform4iv, header) == 0, - OffsetOf_Uniform4iv_header_not_0); -COMPILE_ASSERT(offsetof(Uniform4iv, location) == 4, - OffsetOf_Uniform4iv_location_not_4); -COMPILE_ASSERT(offsetof(Uniform4iv, count) == 8, - OffsetOf_Uniform4iv_count_not_8); -COMPILE_ASSERT(offsetof(Uniform4iv, v_shm_id) == 12, - OffsetOf_Uniform4iv_v_shm_id_not_12); -COMPILE_ASSERT(offsetof(Uniform4iv, v_shm_offset) == 16, - OffsetOf_Uniform4iv_v_shm_offset_not_16); - struct Uniform4ivImmediate { typedef Uniform4ivImmediate ValueType; static const CommandId kCmdId = kUniform4ivImmediate; @@ -6842,65 +5927,6 @@ COMPILE_ASSERT(offsetof(Uniform4ivImmediate, location) == 4, COMPILE_ASSERT(offsetof(Uniform4ivImmediate, count) == 8, OffsetOf_Uniform4ivImmediate_count_not_8); -struct UniformMatrix2fv { - typedef UniformMatrix2fv ValueType; - static const CommandId kCmdId = kUniformMatrix2fv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLint _location, - GLsizei _count, - GLboolean _transpose, - uint32_t _value_shm_id, - uint32_t _value_shm_offset) { - SetHeader(); - location = _location; - count = _count; - transpose = _transpose; - value_shm_id = _value_shm_id; - value_shm_offset = _value_shm_offset; - } - - void* Set(void* cmd, - GLint _location, - GLsizei _count, - GLboolean _transpose, - uint32_t _value_shm_id, - uint32_t _value_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_location, _count, _transpose, _value_shm_id, _value_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t location; - int32_t count; - uint32_t transpose; - uint32_t value_shm_id; - uint32_t value_shm_offset; -}; - -COMPILE_ASSERT(sizeof(UniformMatrix2fv) == 24, - Sizeof_UniformMatrix2fv_is_not_24); -COMPILE_ASSERT(offsetof(UniformMatrix2fv, header) == 0, - OffsetOf_UniformMatrix2fv_header_not_0); -COMPILE_ASSERT(offsetof(UniformMatrix2fv, location) == 4, - OffsetOf_UniformMatrix2fv_location_not_4); -COMPILE_ASSERT(offsetof(UniformMatrix2fv, count) == 8, - OffsetOf_UniformMatrix2fv_count_not_8); -COMPILE_ASSERT(offsetof(UniformMatrix2fv, transpose) == 12, - OffsetOf_UniformMatrix2fv_transpose_not_12); -COMPILE_ASSERT(offsetof(UniformMatrix2fv, value_shm_id) == 16, - OffsetOf_UniformMatrix2fv_value_shm_id_not_16); -COMPILE_ASSERT(offsetof(UniformMatrix2fv, value_shm_offset) == 20, - OffsetOf_UniformMatrix2fv_value_shm_offset_not_20); - struct UniformMatrix2fvImmediate { typedef UniformMatrix2fvImmediate ValueType; static const CommandId kCmdId = kUniformMatrix2fvImmediate; @@ -6920,23 +5946,15 @@ struct UniformMatrix2fvImmediate { header.SetCmdByTotalSize<ValueType>(ComputeSize(count)); } - void Init(GLint _location, - GLsizei _count, - GLboolean _transpose, - const GLfloat* _value) { + void Init(GLint _location, GLsizei _count, const GLfloat* _value) { SetHeader(_count); location = _location; count = _count; - transpose = _transpose; memcpy(ImmediateDataAddress(this), _value, ComputeDataSize(_count)); } - void* Set(void* cmd, - GLint _location, - GLsizei _count, - GLboolean _transpose, - const GLfloat* _value) { - static_cast<ValueType*>(cmd)->Init(_location, _count, _transpose, _value); + void* Set(void* cmd, GLint _location, GLsizei _count, const GLfloat* _value) { + static_cast<ValueType*>(cmd)->Init(_location, _count, _value); const uint32_t size = ComputeSize(_count); return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size); } @@ -6944,78 +5962,17 @@ struct UniformMatrix2fvImmediate { gpu::CommandHeader header; int32_t location; int32_t count; - uint32_t transpose; + static const uint32_t transpose = false; }; -COMPILE_ASSERT(sizeof(UniformMatrix2fvImmediate) == 16, - Sizeof_UniformMatrix2fvImmediate_is_not_16); +COMPILE_ASSERT(sizeof(UniformMatrix2fvImmediate) == 12, + Sizeof_UniformMatrix2fvImmediate_is_not_12); COMPILE_ASSERT(offsetof(UniformMatrix2fvImmediate, header) == 0, OffsetOf_UniformMatrix2fvImmediate_header_not_0); COMPILE_ASSERT(offsetof(UniformMatrix2fvImmediate, location) == 4, OffsetOf_UniformMatrix2fvImmediate_location_not_4); COMPILE_ASSERT(offsetof(UniformMatrix2fvImmediate, count) == 8, OffsetOf_UniformMatrix2fvImmediate_count_not_8); -COMPILE_ASSERT(offsetof(UniformMatrix2fvImmediate, transpose) == 12, - OffsetOf_UniformMatrix2fvImmediate_transpose_not_12); - -struct UniformMatrix3fv { - typedef UniformMatrix3fv ValueType; - static const CommandId kCmdId = kUniformMatrix3fv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLint _location, - GLsizei _count, - GLboolean _transpose, - uint32_t _value_shm_id, - uint32_t _value_shm_offset) { - SetHeader(); - location = _location; - count = _count; - transpose = _transpose; - value_shm_id = _value_shm_id; - value_shm_offset = _value_shm_offset; - } - - void* Set(void* cmd, - GLint _location, - GLsizei _count, - GLboolean _transpose, - uint32_t _value_shm_id, - uint32_t _value_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_location, _count, _transpose, _value_shm_id, _value_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t location; - int32_t count; - uint32_t transpose; - uint32_t value_shm_id; - uint32_t value_shm_offset; -}; - -COMPILE_ASSERT(sizeof(UniformMatrix3fv) == 24, - Sizeof_UniformMatrix3fv_is_not_24); -COMPILE_ASSERT(offsetof(UniformMatrix3fv, header) == 0, - OffsetOf_UniformMatrix3fv_header_not_0); -COMPILE_ASSERT(offsetof(UniformMatrix3fv, location) == 4, - OffsetOf_UniformMatrix3fv_location_not_4); -COMPILE_ASSERT(offsetof(UniformMatrix3fv, count) == 8, - OffsetOf_UniformMatrix3fv_count_not_8); -COMPILE_ASSERT(offsetof(UniformMatrix3fv, transpose) == 12, - OffsetOf_UniformMatrix3fv_transpose_not_12); -COMPILE_ASSERT(offsetof(UniformMatrix3fv, value_shm_id) == 16, - OffsetOf_UniformMatrix3fv_value_shm_id_not_16); -COMPILE_ASSERT(offsetof(UniformMatrix3fv, value_shm_offset) == 20, - OffsetOf_UniformMatrix3fv_value_shm_offset_not_20); struct UniformMatrix3fvImmediate { typedef UniformMatrix3fvImmediate ValueType; @@ -7036,23 +5993,15 @@ struct UniformMatrix3fvImmediate { header.SetCmdByTotalSize<ValueType>(ComputeSize(count)); } - void Init(GLint _location, - GLsizei _count, - GLboolean _transpose, - const GLfloat* _value) { + void Init(GLint _location, GLsizei _count, const GLfloat* _value) { SetHeader(_count); location = _location; count = _count; - transpose = _transpose; memcpy(ImmediateDataAddress(this), _value, ComputeDataSize(_count)); } - void* Set(void* cmd, - GLint _location, - GLsizei _count, - GLboolean _transpose, - const GLfloat* _value) { - static_cast<ValueType*>(cmd)->Init(_location, _count, _transpose, _value); + void* Set(void* cmd, GLint _location, GLsizei _count, const GLfloat* _value) { + static_cast<ValueType*>(cmd)->Init(_location, _count, _value); const uint32_t size = ComputeSize(_count); return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size); } @@ -7060,78 +6009,17 @@ struct UniformMatrix3fvImmediate { gpu::CommandHeader header; int32_t location; int32_t count; - uint32_t transpose; + static const uint32_t transpose = false; }; -COMPILE_ASSERT(sizeof(UniformMatrix3fvImmediate) == 16, - Sizeof_UniformMatrix3fvImmediate_is_not_16); +COMPILE_ASSERT(sizeof(UniformMatrix3fvImmediate) == 12, + Sizeof_UniformMatrix3fvImmediate_is_not_12); COMPILE_ASSERT(offsetof(UniformMatrix3fvImmediate, header) == 0, OffsetOf_UniformMatrix3fvImmediate_header_not_0); COMPILE_ASSERT(offsetof(UniformMatrix3fvImmediate, location) == 4, OffsetOf_UniformMatrix3fvImmediate_location_not_4); COMPILE_ASSERT(offsetof(UniformMatrix3fvImmediate, count) == 8, OffsetOf_UniformMatrix3fvImmediate_count_not_8); -COMPILE_ASSERT(offsetof(UniformMatrix3fvImmediate, transpose) == 12, - OffsetOf_UniformMatrix3fvImmediate_transpose_not_12); - -struct UniformMatrix4fv { - typedef UniformMatrix4fv ValueType; - static const CommandId kCmdId = kUniformMatrix4fv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLint _location, - GLsizei _count, - GLboolean _transpose, - uint32_t _value_shm_id, - uint32_t _value_shm_offset) { - SetHeader(); - location = _location; - count = _count; - transpose = _transpose; - value_shm_id = _value_shm_id; - value_shm_offset = _value_shm_offset; - } - - void* Set(void* cmd, - GLint _location, - GLsizei _count, - GLboolean _transpose, - uint32_t _value_shm_id, - uint32_t _value_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_location, _count, _transpose, _value_shm_id, _value_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t location; - int32_t count; - uint32_t transpose; - uint32_t value_shm_id; - uint32_t value_shm_offset; -}; - -COMPILE_ASSERT(sizeof(UniformMatrix4fv) == 24, - Sizeof_UniformMatrix4fv_is_not_24); -COMPILE_ASSERT(offsetof(UniformMatrix4fv, header) == 0, - OffsetOf_UniformMatrix4fv_header_not_0); -COMPILE_ASSERT(offsetof(UniformMatrix4fv, location) == 4, - OffsetOf_UniformMatrix4fv_location_not_4); -COMPILE_ASSERT(offsetof(UniformMatrix4fv, count) == 8, - OffsetOf_UniformMatrix4fv_count_not_8); -COMPILE_ASSERT(offsetof(UniformMatrix4fv, transpose) == 12, - OffsetOf_UniformMatrix4fv_transpose_not_12); -COMPILE_ASSERT(offsetof(UniformMatrix4fv, value_shm_id) == 16, - OffsetOf_UniformMatrix4fv_value_shm_id_not_16); -COMPILE_ASSERT(offsetof(UniformMatrix4fv, value_shm_offset) == 20, - OffsetOf_UniformMatrix4fv_value_shm_offset_not_20); struct UniformMatrix4fvImmediate { typedef UniformMatrix4fvImmediate ValueType; @@ -7152,23 +6040,15 @@ struct UniformMatrix4fvImmediate { header.SetCmdByTotalSize<ValueType>(ComputeSize(count)); } - void Init(GLint _location, - GLsizei _count, - GLboolean _transpose, - const GLfloat* _value) { + void Init(GLint _location, GLsizei _count, const GLfloat* _value) { SetHeader(_count); location = _location; count = _count; - transpose = _transpose; memcpy(ImmediateDataAddress(this), _value, ComputeDataSize(_count)); } - void* Set(void* cmd, - GLint _location, - GLsizei _count, - GLboolean _transpose, - const GLfloat* _value) { - static_cast<ValueType*>(cmd)->Init(_location, _count, _transpose, _value); + void* Set(void* cmd, GLint _location, GLsizei _count, const GLfloat* _value) { + static_cast<ValueType*>(cmd)->Init(_location, _count, _value); const uint32_t size = ComputeSize(_count); return NextImmediateCmdAddressTotalSize<ValueType>(cmd, size); } @@ -7176,19 +6056,17 @@ struct UniformMatrix4fvImmediate { gpu::CommandHeader header; int32_t location; int32_t count; - uint32_t transpose; + static const uint32_t transpose = false; }; -COMPILE_ASSERT(sizeof(UniformMatrix4fvImmediate) == 16, - Sizeof_UniformMatrix4fvImmediate_is_not_16); +COMPILE_ASSERT(sizeof(UniformMatrix4fvImmediate) == 12, + Sizeof_UniformMatrix4fvImmediate_is_not_12); COMPILE_ASSERT(offsetof(UniformMatrix4fvImmediate, header) == 0, OffsetOf_UniformMatrix4fvImmediate_header_not_0); COMPILE_ASSERT(offsetof(UniformMatrix4fvImmediate, location) == 4, OffsetOf_UniformMatrix4fvImmediate_location_not_4); COMPILE_ASSERT(offsetof(UniformMatrix4fvImmediate, count) == 8, OffsetOf_UniformMatrix4fvImmediate_count_not_8); -COMPILE_ASSERT(offsetof(UniformMatrix4fvImmediate, transpose) == 12, - OffsetOf_UniformMatrix4fvImmediate_transpose_not_12); struct UseProgram { typedef UseProgram ValueType; @@ -7290,52 +6168,6 @@ COMPILE_ASSERT(offsetof(VertexAttrib1f, indx) == 4, COMPILE_ASSERT(offsetof(VertexAttrib1f, x) == 8, OffsetOf_VertexAttrib1f_x_not_8); -struct VertexAttrib1fv { - typedef VertexAttrib1fv ValueType; - static const CommandId kCmdId = kVertexAttrib1fv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLuint _indx, - uint32_t _values_shm_id, - uint32_t _values_shm_offset) { - SetHeader(); - indx = _indx; - values_shm_id = _values_shm_id; - values_shm_offset = _values_shm_offset; - } - - void* Set(void* cmd, - GLuint _indx, - uint32_t _values_shm_id, - uint32_t _values_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_indx, _values_shm_id, _values_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - uint32_t indx; - uint32_t values_shm_id; - uint32_t values_shm_offset; -}; - -COMPILE_ASSERT(sizeof(VertexAttrib1fv) == 16, Sizeof_VertexAttrib1fv_is_not_16); -COMPILE_ASSERT(offsetof(VertexAttrib1fv, header) == 0, - OffsetOf_VertexAttrib1fv_header_not_0); -COMPILE_ASSERT(offsetof(VertexAttrib1fv, indx) == 4, - OffsetOf_VertexAttrib1fv_indx_not_4); -COMPILE_ASSERT(offsetof(VertexAttrib1fv, values_shm_id) == 8, - OffsetOf_VertexAttrib1fv_values_shm_id_not_8); -COMPILE_ASSERT(offsetof(VertexAttrib1fv, values_shm_offset) == 12, - OffsetOf_VertexAttrib1fv_values_shm_offset_not_12); - struct VertexAttrib1fvImmediate { typedef VertexAttrib1fvImmediate ValueType; static const CommandId kCmdId = kVertexAttrib1fvImmediate; @@ -7416,52 +6248,6 @@ COMPILE_ASSERT(offsetof(VertexAttrib2f, x) == 8, COMPILE_ASSERT(offsetof(VertexAttrib2f, y) == 12, OffsetOf_VertexAttrib2f_y_not_12); -struct VertexAttrib2fv { - typedef VertexAttrib2fv ValueType; - static const CommandId kCmdId = kVertexAttrib2fv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLuint _indx, - uint32_t _values_shm_id, - uint32_t _values_shm_offset) { - SetHeader(); - indx = _indx; - values_shm_id = _values_shm_id; - values_shm_offset = _values_shm_offset; - } - - void* Set(void* cmd, - GLuint _indx, - uint32_t _values_shm_id, - uint32_t _values_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_indx, _values_shm_id, _values_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - uint32_t indx; - uint32_t values_shm_id; - uint32_t values_shm_offset; -}; - -COMPILE_ASSERT(sizeof(VertexAttrib2fv) == 16, Sizeof_VertexAttrib2fv_is_not_16); -COMPILE_ASSERT(offsetof(VertexAttrib2fv, header) == 0, - OffsetOf_VertexAttrib2fv_header_not_0); -COMPILE_ASSERT(offsetof(VertexAttrib2fv, indx) == 4, - OffsetOf_VertexAttrib2fv_indx_not_4); -COMPILE_ASSERT(offsetof(VertexAttrib2fv, values_shm_id) == 8, - OffsetOf_VertexAttrib2fv_values_shm_id_not_8); -COMPILE_ASSERT(offsetof(VertexAttrib2fv, values_shm_offset) == 12, - OffsetOf_VertexAttrib2fv_values_shm_offset_not_12); - struct VertexAttrib2fvImmediate { typedef VertexAttrib2fvImmediate ValueType; static const CommandId kCmdId = kVertexAttrib2fvImmediate; @@ -7546,52 +6332,6 @@ COMPILE_ASSERT(offsetof(VertexAttrib3f, y) == 12, COMPILE_ASSERT(offsetof(VertexAttrib3f, z) == 16, OffsetOf_VertexAttrib3f_z_not_16); -struct VertexAttrib3fv { - typedef VertexAttrib3fv ValueType; - static const CommandId kCmdId = kVertexAttrib3fv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLuint _indx, - uint32_t _values_shm_id, - uint32_t _values_shm_offset) { - SetHeader(); - indx = _indx; - values_shm_id = _values_shm_id; - values_shm_offset = _values_shm_offset; - } - - void* Set(void* cmd, - GLuint _indx, - uint32_t _values_shm_id, - uint32_t _values_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_indx, _values_shm_id, _values_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - uint32_t indx; - uint32_t values_shm_id; - uint32_t values_shm_offset; -}; - -COMPILE_ASSERT(sizeof(VertexAttrib3fv) == 16, Sizeof_VertexAttrib3fv_is_not_16); -COMPILE_ASSERT(offsetof(VertexAttrib3fv, header) == 0, - OffsetOf_VertexAttrib3fv_header_not_0); -COMPILE_ASSERT(offsetof(VertexAttrib3fv, indx) == 4, - OffsetOf_VertexAttrib3fv_indx_not_4); -COMPILE_ASSERT(offsetof(VertexAttrib3fv, values_shm_id) == 8, - OffsetOf_VertexAttrib3fv_values_shm_id_not_8); -COMPILE_ASSERT(offsetof(VertexAttrib3fv, values_shm_offset) == 12, - OffsetOf_VertexAttrib3fv_values_shm_offset_not_12); - struct VertexAttrib3fvImmediate { typedef VertexAttrib3fvImmediate ValueType; static const CommandId kCmdId = kVertexAttrib3fvImmediate; @@ -7685,52 +6425,6 @@ COMPILE_ASSERT(offsetof(VertexAttrib4f, z) == 16, COMPILE_ASSERT(offsetof(VertexAttrib4f, w) == 20, OffsetOf_VertexAttrib4f_w_not_20); -struct VertexAttrib4fv { - typedef VertexAttrib4fv ValueType; - static const CommandId kCmdId = kVertexAttrib4fv; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLuint _indx, - uint32_t _values_shm_id, - uint32_t _values_shm_offset) { - SetHeader(); - indx = _indx; - values_shm_id = _values_shm_id; - values_shm_offset = _values_shm_offset; - } - - void* Set(void* cmd, - GLuint _indx, - uint32_t _values_shm_id, - uint32_t _values_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_indx, _values_shm_id, _values_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - uint32_t indx; - uint32_t values_shm_id; - uint32_t values_shm_offset; -}; - -COMPILE_ASSERT(sizeof(VertexAttrib4fv) == 16, Sizeof_VertexAttrib4fv_is_not_16); -COMPILE_ASSERT(offsetof(VertexAttrib4fv, header) == 0, - OffsetOf_VertexAttrib4fv_header_not_0); -COMPILE_ASSERT(offsetof(VertexAttrib4fv, indx) == 4, - OffsetOf_VertexAttrib4fv_indx_not_4); -COMPILE_ASSERT(offsetof(VertexAttrib4fv, values_shm_id) == 8, - OffsetOf_VertexAttrib4fv_values_shm_id_not_8); -COMPILE_ASSERT(offsetof(VertexAttrib4fv, values_shm_offset) == 12, - OffsetOf_VertexAttrib4fv_values_shm_offset_not_12); - struct VertexAttrib4fvImmediate { typedef VertexAttrib4fvImmediate ValueType; static const CommandId kCmdId = kVertexAttrib4fvImmediate; @@ -8111,14 +6805,12 @@ struct FramebufferTexture2DMultisampleEXT { GLenum _attachment, GLenum _textarget, GLuint _texture, - GLint _level, GLsizei _samples) { SetHeader(); target = _target; attachment = _attachment; textarget = _textarget; texture = _texture; - level = _level; samples = _samples; } @@ -8127,10 +6819,9 @@ struct FramebufferTexture2DMultisampleEXT { GLenum _attachment, GLenum _textarget, GLuint _texture, - GLint _level, GLsizei _samples) { static_cast<ValueType*>(cmd) - ->Init(_target, _attachment, _textarget, _texture, _level, _samples); + ->Init(_target, _attachment, _textarget, _texture, _samples); return NextCmdAddress<ValueType>(cmd); } @@ -8139,12 +6830,12 @@ struct FramebufferTexture2DMultisampleEXT { uint32_t attachment; uint32_t textarget; uint32_t texture; - int32_t level; int32_t samples; + static const int32_t level = 0; }; -COMPILE_ASSERT(sizeof(FramebufferTexture2DMultisampleEXT) == 28, - Sizeof_FramebufferTexture2DMultisampleEXT_is_not_28); +COMPILE_ASSERT(sizeof(FramebufferTexture2DMultisampleEXT) == 24, + Sizeof_FramebufferTexture2DMultisampleEXT_is_not_24); COMPILE_ASSERT(offsetof(FramebufferTexture2DMultisampleEXT, header) == 0, OffsetOf_FramebufferTexture2DMultisampleEXT_header_not_0); COMPILE_ASSERT(offsetof(FramebufferTexture2DMultisampleEXT, target) == 4, @@ -8155,10 +6846,8 @@ COMPILE_ASSERT(offsetof(FramebufferTexture2DMultisampleEXT, textarget) == 12, OffsetOf_FramebufferTexture2DMultisampleEXT_textarget_not_12); COMPILE_ASSERT(offsetof(FramebufferTexture2DMultisampleEXT, texture) == 16, OffsetOf_FramebufferTexture2DMultisampleEXT_texture_not_16); -COMPILE_ASSERT(offsetof(FramebufferTexture2DMultisampleEXT, level) == 20, - OffsetOf_FramebufferTexture2DMultisampleEXT_level_not_20); -COMPILE_ASSERT(offsetof(FramebufferTexture2DMultisampleEXT, samples) == 24, - OffsetOf_FramebufferTexture2DMultisampleEXT_samples_not_24); +COMPILE_ASSERT(offsetof(FramebufferTexture2DMultisampleEXT, samples) == 20, + OffsetOf_FramebufferTexture2DMultisampleEXT_samples_not_20); struct TexStorage2DEXT { typedef TexStorage2DEXT ValueType; @@ -8218,51 +6907,6 @@ COMPILE_ASSERT(offsetof(TexStorage2DEXT, width) == 16, COMPILE_ASSERT(offsetof(TexStorage2DEXT, height) == 20, OffsetOf_TexStorage2DEXT_height_not_20); -struct GenQueriesEXT { - typedef GenQueriesEXT ValueType; - static const CommandId kCmdId = kGenQueriesEXT; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _n, - uint32_t _queries_shm_id, - uint32_t _queries_shm_offset) { - SetHeader(); - n = _n; - queries_shm_id = _queries_shm_id; - queries_shm_offset = _queries_shm_offset; - } - - void* Set(void* cmd, - GLsizei _n, - uint32_t _queries_shm_id, - uint32_t _queries_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_n, _queries_shm_id, _queries_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t n; - uint32_t queries_shm_id; - uint32_t queries_shm_offset; -}; - -COMPILE_ASSERT(sizeof(GenQueriesEXT) == 16, Sizeof_GenQueriesEXT_is_not_16); -COMPILE_ASSERT(offsetof(GenQueriesEXT, header) == 0, - OffsetOf_GenQueriesEXT_header_not_0); -COMPILE_ASSERT(offsetof(GenQueriesEXT, n) == 4, OffsetOf_GenQueriesEXT_n_not_4); -COMPILE_ASSERT(offsetof(GenQueriesEXT, queries_shm_id) == 8, - OffsetOf_GenQueriesEXT_queries_shm_id_not_8); -COMPILE_ASSERT(offsetof(GenQueriesEXT, queries_shm_offset) == 12, - OffsetOf_GenQueriesEXT_queries_shm_offset_not_12); - struct GenQueriesEXTImmediate { typedef GenQueriesEXTImmediate ValueType; static const CommandId kCmdId = kGenQueriesEXTImmediate; @@ -8305,53 +6949,6 @@ COMPILE_ASSERT(offsetof(GenQueriesEXTImmediate, header) == 0, COMPILE_ASSERT(offsetof(GenQueriesEXTImmediate, n) == 4, OffsetOf_GenQueriesEXTImmediate_n_not_4); -struct DeleteQueriesEXT { - typedef DeleteQueriesEXT ValueType; - static const CommandId kCmdId = kDeleteQueriesEXT; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _n, - uint32_t _queries_shm_id, - uint32_t _queries_shm_offset) { - SetHeader(); - n = _n; - queries_shm_id = _queries_shm_id; - queries_shm_offset = _queries_shm_offset; - } - - void* Set(void* cmd, - GLsizei _n, - uint32_t _queries_shm_id, - uint32_t _queries_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_n, _queries_shm_id, _queries_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t n; - uint32_t queries_shm_id; - uint32_t queries_shm_offset; -}; - -COMPILE_ASSERT(sizeof(DeleteQueriesEXT) == 16, - Sizeof_DeleteQueriesEXT_is_not_16); -COMPILE_ASSERT(offsetof(DeleteQueriesEXT, header) == 0, - OffsetOf_DeleteQueriesEXT_header_not_0); -COMPILE_ASSERT(offsetof(DeleteQueriesEXT, n) == 4, - OffsetOf_DeleteQueriesEXT_n_not_4); -COMPILE_ASSERT(offsetof(DeleteQueriesEXT, queries_shm_id) == 8, - OffsetOf_DeleteQueriesEXT_queries_shm_id_not_8); -COMPILE_ASSERT(offsetof(DeleteQueriesEXT, queries_shm_offset) == 12, - OffsetOf_DeleteQueriesEXT_queries_shm_offset_not_12); - struct DeleteQueriesEXTImmediate { typedef DeleteQueriesEXTImmediate ValueType; static const CommandId kCmdId = kDeleteQueriesEXTImmediate; @@ -8575,50 +7172,6 @@ COMPILE_ASSERT(sizeof(PopGroupMarkerEXT) == 4, COMPILE_ASSERT(offsetof(PopGroupMarkerEXT, header) == 0, OffsetOf_PopGroupMarkerEXT_header_not_0); -struct GenVertexArraysOES { - typedef GenVertexArraysOES ValueType; - static const CommandId kCmdId = kGenVertexArraysOES; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _n, uint32_t _arrays_shm_id, uint32_t _arrays_shm_offset) { - SetHeader(); - n = _n; - arrays_shm_id = _arrays_shm_id; - arrays_shm_offset = _arrays_shm_offset; - } - - void* Set(void* cmd, - GLsizei _n, - uint32_t _arrays_shm_id, - uint32_t _arrays_shm_offset) { - static_cast<ValueType*>(cmd)->Init(_n, _arrays_shm_id, _arrays_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t n; - uint32_t arrays_shm_id; - uint32_t arrays_shm_offset; -}; - -COMPILE_ASSERT(sizeof(GenVertexArraysOES) == 16, - Sizeof_GenVertexArraysOES_is_not_16); -COMPILE_ASSERT(offsetof(GenVertexArraysOES, header) == 0, - OffsetOf_GenVertexArraysOES_header_not_0); -COMPILE_ASSERT(offsetof(GenVertexArraysOES, n) == 4, - OffsetOf_GenVertexArraysOES_n_not_4); -COMPILE_ASSERT(offsetof(GenVertexArraysOES, arrays_shm_id) == 8, - OffsetOf_GenVertexArraysOES_arrays_shm_id_not_8); -COMPILE_ASSERT(offsetof(GenVertexArraysOES, arrays_shm_offset) == 12, - OffsetOf_GenVertexArraysOES_arrays_shm_offset_not_12); - struct GenVertexArraysOESImmediate { typedef GenVertexArraysOESImmediate ValueType; static const CommandId kCmdId = kGenVertexArraysOESImmediate; @@ -8661,50 +7214,6 @@ COMPILE_ASSERT(offsetof(GenVertexArraysOESImmediate, header) == 0, COMPILE_ASSERT(offsetof(GenVertexArraysOESImmediate, n) == 4, OffsetOf_GenVertexArraysOESImmediate_n_not_4); -struct DeleteVertexArraysOES { - typedef DeleteVertexArraysOES ValueType; - static const CommandId kCmdId = kDeleteVertexArraysOES; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _n, uint32_t _arrays_shm_id, uint32_t _arrays_shm_offset) { - SetHeader(); - n = _n; - arrays_shm_id = _arrays_shm_id; - arrays_shm_offset = _arrays_shm_offset; - } - - void* Set(void* cmd, - GLsizei _n, - uint32_t _arrays_shm_id, - uint32_t _arrays_shm_offset) { - static_cast<ValueType*>(cmd)->Init(_n, _arrays_shm_id, _arrays_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t n; - uint32_t arrays_shm_id; - uint32_t arrays_shm_offset; -}; - -COMPILE_ASSERT(sizeof(DeleteVertexArraysOES) == 16, - Sizeof_DeleteVertexArraysOES_is_not_16); -COMPILE_ASSERT(offsetof(DeleteVertexArraysOES, header) == 0, - OffsetOf_DeleteVertexArraysOES_header_not_0); -COMPILE_ASSERT(offsetof(DeleteVertexArraysOES, n) == 4, - OffsetOf_DeleteVertexArraysOES_n_not_4); -COMPILE_ASSERT(offsetof(DeleteVertexArraysOES, arrays_shm_id) == 8, - OffsetOf_DeleteVertexArraysOES_arrays_shm_id_not_8); -COMPILE_ASSERT(offsetof(DeleteVertexArraysOES, arrays_shm_offset) == 12, - OffsetOf_DeleteVertexArraysOES_arrays_shm_offset_not_12); - struct DeleteVertexArraysOESImmediate { typedef DeleteVertexArraysOESImmediate ValueType; static const CommandId kCmdId = kDeleteVertexArraysOESImmediate; @@ -9711,53 +8220,6 @@ COMPILE_ASSERT(offsetof(VertexAttribDivisorANGLE, index) == 4, COMPILE_ASSERT(offsetof(VertexAttribDivisorANGLE, divisor) == 8, OffsetOf_VertexAttribDivisorANGLE_divisor_not_8); -struct ProduceTextureCHROMIUM { - typedef ProduceTextureCHROMIUM ValueType; - static const CommandId kCmdId = kProduceTextureCHROMIUM; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLenum _target, - uint32_t _mailbox_shm_id, - uint32_t _mailbox_shm_offset) { - SetHeader(); - target = _target; - mailbox_shm_id = _mailbox_shm_id; - mailbox_shm_offset = _mailbox_shm_offset; - } - - void* Set(void* cmd, - GLenum _target, - uint32_t _mailbox_shm_id, - uint32_t _mailbox_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_target, _mailbox_shm_id, _mailbox_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - uint32_t target; - uint32_t mailbox_shm_id; - uint32_t mailbox_shm_offset; -}; - -COMPILE_ASSERT(sizeof(ProduceTextureCHROMIUM) == 16, - Sizeof_ProduceTextureCHROMIUM_is_not_16); -COMPILE_ASSERT(offsetof(ProduceTextureCHROMIUM, header) == 0, - OffsetOf_ProduceTextureCHROMIUM_header_not_0); -COMPILE_ASSERT(offsetof(ProduceTextureCHROMIUM, target) == 4, - OffsetOf_ProduceTextureCHROMIUM_target_not_4); -COMPILE_ASSERT(offsetof(ProduceTextureCHROMIUM, mailbox_shm_id) == 8, - OffsetOf_ProduceTextureCHROMIUM_mailbox_shm_id_not_8); -COMPILE_ASSERT(offsetof(ProduceTextureCHROMIUM, mailbox_shm_offset) == 12, - OffsetOf_ProduceTextureCHROMIUM_mailbox_shm_offset_not_12); - struct ProduceTextureCHROMIUMImmediate { typedef ProduceTextureCHROMIUMImmediate ValueType; static const CommandId kCmdId = kProduceTextureCHROMIUMImmediate; @@ -9798,53 +8260,6 @@ COMPILE_ASSERT(offsetof(ProduceTextureCHROMIUMImmediate, header) == 0, COMPILE_ASSERT(offsetof(ProduceTextureCHROMIUMImmediate, target) == 4, OffsetOf_ProduceTextureCHROMIUMImmediate_target_not_4); -struct ConsumeTextureCHROMIUM { - typedef ConsumeTextureCHROMIUM ValueType; - static const CommandId kCmdId = kConsumeTextureCHROMIUM; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(1); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLenum _target, - uint32_t _mailbox_shm_id, - uint32_t _mailbox_shm_offset) { - SetHeader(); - target = _target; - mailbox_shm_id = _mailbox_shm_id; - mailbox_shm_offset = _mailbox_shm_offset; - } - - void* Set(void* cmd, - GLenum _target, - uint32_t _mailbox_shm_id, - uint32_t _mailbox_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_target, _mailbox_shm_id, _mailbox_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - uint32_t target; - uint32_t mailbox_shm_id; - uint32_t mailbox_shm_offset; -}; - -COMPILE_ASSERT(sizeof(ConsumeTextureCHROMIUM) == 16, - Sizeof_ConsumeTextureCHROMIUM_is_not_16); -COMPILE_ASSERT(offsetof(ConsumeTextureCHROMIUM, header) == 0, - OffsetOf_ConsumeTextureCHROMIUM_header_not_0); -COMPILE_ASSERT(offsetof(ConsumeTextureCHROMIUM, target) == 4, - OffsetOf_ConsumeTextureCHROMIUM_target_not_4); -COMPILE_ASSERT(offsetof(ConsumeTextureCHROMIUM, mailbox_shm_id) == 8, - OffsetOf_ConsumeTextureCHROMIUM_mailbox_shm_id_not_8); -COMPILE_ASSERT(offsetof(ConsumeTextureCHROMIUM, mailbox_shm_offset) == 12, - OffsetOf_ConsumeTextureCHROMIUM_mailbox_shm_offset_not_12); - struct ConsumeTextureCHROMIUMImmediate { typedef ConsumeTextureCHROMIUMImmediate ValueType; static const CommandId kCmdId = kConsumeTextureCHROMIUMImmediate; @@ -10257,7 +8672,6 @@ struct AsyncTexImage2DCHROMIUM { GLint _internalformat, GLsizei _width, GLsizei _height, - GLint _border, GLenum _format, GLenum _type, uint32_t _pixels_shm_id, @@ -10271,7 +8685,6 @@ struct AsyncTexImage2DCHROMIUM { internalformat = _internalformat; width = _width; height = _height; - border = _border; format = _format; type = _type; pixels_shm_id = _pixels_shm_id; @@ -10287,7 +8700,6 @@ struct AsyncTexImage2DCHROMIUM { GLint _internalformat, GLsizei _width, GLsizei _height, - GLint _border, GLenum _format, GLenum _type, uint32_t _pixels_shm_id, @@ -10300,7 +8712,6 @@ struct AsyncTexImage2DCHROMIUM { _internalformat, _width, _height, - _border, _format, _type, _pixels_shm_id, @@ -10317,7 +8728,6 @@ struct AsyncTexImage2DCHROMIUM { int32_t internalformat; int32_t width; int32_t height; - int32_t border; uint32_t format; uint32_t type; uint32_t pixels_shm_id; @@ -10325,10 +8735,11 @@ struct AsyncTexImage2DCHROMIUM { uint32_t async_upload_token; uint32_t sync_data_shm_id; uint32_t sync_data_shm_offset; + static const int32_t border = 0; }; -COMPILE_ASSERT(sizeof(AsyncTexImage2DCHROMIUM) == 56, - Sizeof_AsyncTexImage2DCHROMIUM_is_not_56); +COMPILE_ASSERT(sizeof(AsyncTexImage2DCHROMIUM) == 52, + Sizeof_AsyncTexImage2DCHROMIUM_is_not_52); COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, header) == 0, OffsetOf_AsyncTexImage2DCHROMIUM_header_not_0); COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, target) == 4, @@ -10341,22 +8752,20 @@ COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, width) == 16, OffsetOf_AsyncTexImage2DCHROMIUM_width_not_16); COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, height) == 20, OffsetOf_AsyncTexImage2DCHROMIUM_height_not_20); -COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, border) == 24, - OffsetOf_AsyncTexImage2DCHROMIUM_border_not_24); -COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, format) == 28, - OffsetOf_AsyncTexImage2DCHROMIUM_format_not_28); -COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, type) == 32, - OffsetOf_AsyncTexImage2DCHROMIUM_type_not_32); -COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, pixels_shm_id) == 36, - OffsetOf_AsyncTexImage2DCHROMIUM_pixels_shm_id_not_36); -COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, pixels_shm_offset) == 40, - OffsetOf_AsyncTexImage2DCHROMIUM_pixels_shm_offset_not_40); -COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, async_upload_token) == 44, - OffsetOf_AsyncTexImage2DCHROMIUM_async_upload_token_not_44); -COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, sync_data_shm_id) == 48, - OffsetOf_AsyncTexImage2DCHROMIUM_sync_data_shm_id_not_48); -COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, sync_data_shm_offset) == 52, - OffsetOf_AsyncTexImage2DCHROMIUM_sync_data_shm_offset_not_52); +COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, format) == 24, + OffsetOf_AsyncTexImage2DCHROMIUM_format_not_24); +COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, type) == 28, + OffsetOf_AsyncTexImage2DCHROMIUM_type_not_28); +COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, pixels_shm_id) == 32, + OffsetOf_AsyncTexImage2DCHROMIUM_pixels_shm_id_not_32); +COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, pixels_shm_offset) == 36, + OffsetOf_AsyncTexImage2DCHROMIUM_pixels_shm_offset_not_36); +COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, async_upload_token) == 40, + OffsetOf_AsyncTexImage2DCHROMIUM_async_upload_token_not_40); +COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, sync_data_shm_id) == 44, + OffsetOf_AsyncTexImage2DCHROMIUM_sync_data_shm_id_not_44); +COMPILE_ASSERT(offsetof(AsyncTexImage2DCHROMIUM, sync_data_shm_offset) == 48, + OffsetOf_AsyncTexImage2DCHROMIUM_sync_data_shm_offset_not_48); struct WaitAsyncTexImage2DCHROMIUM { typedef WaitAsyncTexImage2DCHROMIUM ValueType; @@ -10418,59 +8827,6 @@ COMPILE_ASSERT(sizeof(WaitAllAsyncTexImage2DCHROMIUM) == 4, COMPILE_ASSERT(offsetof(WaitAllAsyncTexImage2DCHROMIUM, header) == 0, OffsetOf_WaitAllAsyncTexImage2DCHROMIUM_header_not_0); -struct DiscardFramebufferEXT { - typedef DiscardFramebufferEXT ValueType; - static const CommandId kCmdId = kDiscardFramebufferEXT; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLenum _target, - GLsizei _count, - uint32_t _attachments_shm_id, - uint32_t _attachments_shm_offset) { - SetHeader(); - target = _target; - count = _count; - attachments_shm_id = _attachments_shm_id; - attachments_shm_offset = _attachments_shm_offset; - } - - void* Set(void* cmd, - GLenum _target, - GLsizei _count, - uint32_t _attachments_shm_id, - uint32_t _attachments_shm_offset) { - static_cast<ValueType*>(cmd) - ->Init(_target, _count, _attachments_shm_id, _attachments_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - uint32_t target; - int32_t count; - uint32_t attachments_shm_id; - uint32_t attachments_shm_offset; -}; - -COMPILE_ASSERT(sizeof(DiscardFramebufferEXT) == 20, - Sizeof_DiscardFramebufferEXT_is_not_20); -COMPILE_ASSERT(offsetof(DiscardFramebufferEXT, header) == 0, - OffsetOf_DiscardFramebufferEXT_header_not_0); -COMPILE_ASSERT(offsetof(DiscardFramebufferEXT, target) == 4, - OffsetOf_DiscardFramebufferEXT_target_not_4); -COMPILE_ASSERT(offsetof(DiscardFramebufferEXT, count) == 8, - OffsetOf_DiscardFramebufferEXT_count_not_8); -COMPILE_ASSERT(offsetof(DiscardFramebufferEXT, attachments_shm_id) == 12, - OffsetOf_DiscardFramebufferEXT_attachments_shm_id_not_12); -COMPILE_ASSERT(offsetof(DiscardFramebufferEXT, attachments_shm_offset) == 16, - OffsetOf_DiscardFramebufferEXT_attachments_shm_offset_not_16); - struct DiscardFramebufferEXTImmediate { typedef DiscardFramebufferEXTImmediate ValueType; static const CommandId kCmdId = kDiscardFramebufferEXTImmediate; @@ -10590,49 +8946,6 @@ COMPILE_ASSERT(offsetof(WaitSyncPointCHROMIUM, header) == 0, COMPILE_ASSERT(offsetof(WaitSyncPointCHROMIUM, sync_point) == 4, OffsetOf_WaitSyncPointCHROMIUM_sync_point_not_4); -struct DrawBuffersEXT { - typedef DrawBuffersEXT ValueType; - static const CommandId kCmdId = kDrawBuffersEXT; - static const cmd::ArgFlags kArgFlags = cmd::kFixed; - static const uint8 cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3); - - static uint32_t ComputeSize() { - return static_cast<uint32_t>(sizeof(ValueType)); // NOLINT - } - - void SetHeader() { header.SetCmd<ValueType>(); } - - void Init(GLsizei _count, uint32_t _bufs_shm_id, uint32_t _bufs_shm_offset) { - SetHeader(); - count = _count; - bufs_shm_id = _bufs_shm_id; - bufs_shm_offset = _bufs_shm_offset; - } - - void* Set(void* cmd, - GLsizei _count, - uint32_t _bufs_shm_id, - uint32_t _bufs_shm_offset) { - static_cast<ValueType*>(cmd)->Init(_count, _bufs_shm_id, _bufs_shm_offset); - return NextCmdAddress<ValueType>(cmd); - } - - gpu::CommandHeader header; - int32_t count; - uint32_t bufs_shm_id; - uint32_t bufs_shm_offset; -}; - -COMPILE_ASSERT(sizeof(DrawBuffersEXT) == 16, Sizeof_DrawBuffersEXT_is_not_16); -COMPILE_ASSERT(offsetof(DrawBuffersEXT, header) == 0, - OffsetOf_DrawBuffersEXT_header_not_0); -COMPILE_ASSERT(offsetof(DrawBuffersEXT, count) == 4, - OffsetOf_DrawBuffersEXT_count_not_4); -COMPILE_ASSERT(offsetof(DrawBuffersEXT, bufs_shm_id) == 8, - OffsetOf_DrawBuffersEXT_bufs_shm_id_not_8); -COMPILE_ASSERT(offsetof(DrawBuffersEXT, bufs_shm_offset) == 12, - OffsetOf_DrawBuffersEXT_bufs_shm_offset_not_12); - struct DrawBuffersEXTImmediate { typedef DrawBuffersEXTImmediate ValueType; static const CommandId kCmdId = kDrawBuffersEXTImmediate; 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 115137d4af..e3ccc12ae8 100644 --- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h +++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h @@ -321,10 +321,9 @@ TEST_F(GLES2FormatTest, CompressedTexImage2D) { static_cast<GLenum>(13), static_cast<GLsizei>(14), static_cast<GLsizei>(15), - static_cast<GLint>(16), - static_cast<GLsizei>(17), - static_cast<uint32_t>(18), - static_cast<uint32_t>(19)); + static_cast<GLsizei>(16), + static_cast<uint32_t>(17), + static_cast<uint32_t>(18)); EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexImage2D::kCmdId), cmd.header.command); EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); @@ -333,10 +332,9 @@ TEST_F(GLES2FormatTest, CompressedTexImage2D) { EXPECT_EQ(static_cast<GLenum>(13), cmd.internalformat); EXPECT_EQ(static_cast<GLsizei>(14), cmd.width); EXPECT_EQ(static_cast<GLsizei>(15), cmd.height); - EXPECT_EQ(static_cast<GLint>(16), cmd.border); - EXPECT_EQ(static_cast<GLsizei>(17), cmd.imageSize); - EXPECT_EQ(static_cast<uint32_t>(18), cmd.data_shm_id); - EXPECT_EQ(static_cast<uint32_t>(19), cmd.data_shm_offset); + EXPECT_EQ(static_cast<GLsizei>(16), cmd.imageSize); + EXPECT_EQ(static_cast<uint32_t>(17), cmd.data_shm_id); + EXPECT_EQ(static_cast<uint32_t>(18), cmd.data_shm_offset); CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } @@ -349,8 +347,7 @@ TEST_F(GLES2FormatTest, CompressedTexImage2DBucket) { static_cast<GLenum>(13), static_cast<GLsizei>(14), static_cast<GLsizei>(15), - static_cast<GLint>(16), - static_cast<GLuint>(17)); + static_cast<GLuint>(16)); EXPECT_EQ(static_cast<uint32_t>(cmds::CompressedTexImage2DBucket::kCmdId), cmd.header.command); EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); @@ -359,8 +356,7 @@ TEST_F(GLES2FormatTest, CompressedTexImage2DBucket) { EXPECT_EQ(static_cast<GLenum>(13), cmd.internalformat); EXPECT_EQ(static_cast<GLsizei>(14), cmd.width); EXPECT_EQ(static_cast<GLsizei>(15), cmd.height); - EXPECT_EQ(static_cast<GLint>(16), cmd.border); - EXPECT_EQ(static_cast<GLuint>(17), cmd.bucket_id); + EXPECT_EQ(static_cast<GLuint>(16), cmd.bucket_id); CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } @@ -429,8 +425,7 @@ TEST_F(GLES2FormatTest, CopyTexImage2D) { static_cast<GLint>(14), static_cast<GLint>(15), static_cast<GLsizei>(16), - static_cast<GLsizei>(17), - static_cast<GLint>(18)); + static_cast<GLsizei>(17)); EXPECT_EQ(static_cast<uint32_t>(cmds::CopyTexImage2D::kCmdId), cmd.header.command); EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); @@ -441,7 +436,6 @@ TEST_F(GLES2FormatTest, CopyTexImage2D) { EXPECT_EQ(static_cast<GLint>(15), cmd.y); EXPECT_EQ(static_cast<GLsizei>(16), cmd.width); EXPECT_EQ(static_cast<GLsizei>(17), cmd.height); - EXPECT_EQ(static_cast<GLint>(18), cmd.border); CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } @@ -501,21 +495,6 @@ TEST_F(GLES2FormatTest, CullFace) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, DeleteBuffers) { - cmds::DeleteBuffers& cmd = *GetBufferAs<cmds::DeleteBuffers>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteBuffers::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.n); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.buffers_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.buffers_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, DeleteBuffersImmediate) { static GLuint ids[] = { 12, 23, 34, @@ -534,21 +513,6 @@ TEST_F(GLES2FormatTest, DeleteBuffersImmediate) { // TODO(gman): Check that ids were inserted; } -TEST_F(GLES2FormatTest, DeleteFramebuffers) { - cmds::DeleteFramebuffers& cmd = *GetBufferAs<cmds::DeleteFramebuffers>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteFramebuffers::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.n); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.framebuffers_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.framebuffers_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, DeleteFramebuffersImmediate) { static GLuint ids[] = { 12, 23, 34, @@ -577,21 +541,6 @@ TEST_F(GLES2FormatTest, DeleteProgram) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, DeleteRenderbuffers) { - cmds::DeleteRenderbuffers& cmd = *GetBufferAs<cmds::DeleteRenderbuffers>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteRenderbuffers::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.n); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.renderbuffers_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.renderbuffers_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, DeleteRenderbuffersImmediate) { static GLuint ids[] = { 12, 23, 34, @@ -620,21 +569,6 @@ TEST_F(GLES2FormatTest, DeleteShader) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, DeleteTextures) { - cmds::DeleteTextures& cmd = *GetBufferAs<cmds::DeleteTextures>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteTextures::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.n); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.textures_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.textures_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, DeleteTexturesImmediate) { static GLuint ids[] = { 12, 23, 34, @@ -807,8 +741,7 @@ TEST_F(GLES2FormatTest, FramebufferTexture2D) { static_cast<GLenum>(11), static_cast<GLenum>(12), static_cast<GLenum>(13), - static_cast<GLuint>(14), - static_cast<GLint>(15)); + static_cast<GLuint>(14)); EXPECT_EQ(static_cast<uint32_t>(cmds::FramebufferTexture2D::kCmdId), cmd.header.command); EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); @@ -816,7 +749,6 @@ TEST_F(GLES2FormatTest, FramebufferTexture2D) { EXPECT_EQ(static_cast<GLenum>(12), cmd.attachment); EXPECT_EQ(static_cast<GLenum>(13), cmd.textarget); EXPECT_EQ(static_cast<GLuint>(14), cmd.texture); - EXPECT_EQ(static_cast<GLint>(15), cmd.level); CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } @@ -829,21 +761,6 @@ TEST_F(GLES2FormatTest, FrontFace) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, GenBuffers) { - cmds::GenBuffers& cmd = *GetBufferAs<cmds::GenBuffers>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::GenBuffers::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.n); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.buffers_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.buffers_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, GenBuffersImmediate) { static GLuint ids[] = { 12, 23, 34, @@ -871,21 +788,6 @@ TEST_F(GLES2FormatTest, GenerateMipmap) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, GenFramebuffers) { - cmds::GenFramebuffers& cmd = *GetBufferAs<cmds::GenFramebuffers>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::GenFramebuffers::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.n); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.framebuffers_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.framebuffers_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, GenFramebuffersImmediate) { static GLuint ids[] = { 12, 23, 34, @@ -904,21 +806,6 @@ TEST_F(GLES2FormatTest, GenFramebuffersImmediate) { // TODO(gman): Check that ids were inserted; } -TEST_F(GLES2FormatTest, GenRenderbuffers) { - cmds::GenRenderbuffers& cmd = *GetBufferAs<cmds::GenRenderbuffers>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::GenRenderbuffers::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.n); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.renderbuffers_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.renderbuffers_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, GenRenderbuffersImmediate) { static GLuint ids[] = { 12, 23, 34, @@ -937,21 +824,6 @@ TEST_F(GLES2FormatTest, GenRenderbuffersImmediate) { // TODO(gman): Check that ids were inserted; } -TEST_F(GLES2FormatTest, GenTextures) { - cmds::GenTextures& cmd = *GetBufferAs<cmds::GenTextures>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::GenTextures::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.n); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.textures_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.textures_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, GenTexturesImmediate) { static GLuint ids[] = { 12, 23, 34, @@ -1743,11 +1615,10 @@ TEST_F(GLES2FormatTest, TexImage2D) { static_cast<GLint>(13), static_cast<GLsizei>(14), static_cast<GLsizei>(15), - static_cast<GLint>(16), + static_cast<GLenum>(16), static_cast<GLenum>(17), - static_cast<GLenum>(18), - static_cast<uint32_t>(19), - static_cast<uint32_t>(20)); + static_cast<uint32_t>(18), + static_cast<uint32_t>(19)); EXPECT_EQ(static_cast<uint32_t>(cmds::TexImage2D::kCmdId), cmd.header.command); EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); @@ -1756,11 +1627,10 @@ TEST_F(GLES2FormatTest, TexImage2D) { EXPECT_EQ(static_cast<GLint>(13), cmd.internalformat); EXPECT_EQ(static_cast<GLsizei>(14), cmd.width); EXPECT_EQ(static_cast<GLsizei>(15), cmd.height); - EXPECT_EQ(static_cast<GLint>(16), cmd.border); - EXPECT_EQ(static_cast<GLenum>(17), cmd.format); - EXPECT_EQ(static_cast<GLenum>(18), cmd.type); - EXPECT_EQ(static_cast<uint32_t>(19), cmd.pixels_shm_id); - EXPECT_EQ(static_cast<uint32_t>(20), cmd.pixels_shm_offset); + EXPECT_EQ(static_cast<GLenum>(16), cmd.format); + EXPECT_EQ(static_cast<GLenum>(17), cmd.type); + EXPECT_EQ(static_cast<uint32_t>(18), cmd.pixels_shm_id); + EXPECT_EQ(static_cast<uint32_t>(19), cmd.pixels_shm_offset); CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } @@ -1779,23 +1649,6 @@ TEST_F(GLES2FormatTest, TexParameterf) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, TexParameterfv) { - cmds::TexParameterfv& cmd = *GetBufferAs<cmds::TexParameterfv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLenum>(11), - static_cast<GLenum>(12), - static_cast<uint32_t>(13), - static_cast<uint32_t>(14)); - EXPECT_EQ(static_cast<uint32_t>(cmds::TexParameterfv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLenum>(11), cmd.target); - EXPECT_EQ(static_cast<GLenum>(12), cmd.pname); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, TexParameterfvImmediate) { const int kSomeBaseValueToTestWith = 51; static GLfloat data[] = { @@ -1831,23 +1684,6 @@ TEST_F(GLES2FormatTest, TexParameteri) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, TexParameteriv) { - cmds::TexParameteriv& cmd = *GetBufferAs<cmds::TexParameteriv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLenum>(11), - static_cast<GLenum>(12), - static_cast<uint32_t>(13), - static_cast<uint32_t>(14)); - EXPECT_EQ(static_cast<uint32_t>(cmds::TexParameteriv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLenum>(11), cmd.target); - EXPECT_EQ(static_cast<GLenum>(12), cmd.pname); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.params_shm_id); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.params_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, TexParameterivImmediate) { const int kSomeBaseValueToTestWith = 51; static GLint data[] = { @@ -1910,23 +1746,6 @@ TEST_F(GLES2FormatTest, Uniform1f) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, Uniform1fv) { - cmds::Uniform1fv& cmd = *GetBufferAs<cmds::Uniform1fv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(11), - static_cast<GLsizei>(12), - static_cast<uint32_t>(13), - static_cast<uint32_t>(14)); - EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform1fv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLint>(11), cmd.location); - EXPECT_EQ(static_cast<GLsizei>(12), cmd.count); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, Uniform1fvImmediate) { const int kSomeBaseValueToTestWith = 51; static GLfloat data[] = { @@ -1960,23 +1779,6 @@ TEST_F(GLES2FormatTest, Uniform1i) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, Uniform1iv) { - cmds::Uniform1iv& cmd = *GetBufferAs<cmds::Uniform1iv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(11), - static_cast<GLsizei>(12), - static_cast<uint32_t>(13), - static_cast<uint32_t>(14)); - EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform1iv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLint>(11), cmd.location); - EXPECT_EQ(static_cast<GLsizei>(12), cmd.count); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, Uniform1ivImmediate) { const int kSomeBaseValueToTestWith = 51; static GLint data[] = { @@ -2013,23 +1815,6 @@ TEST_F(GLES2FormatTest, Uniform2f) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, Uniform2fv) { - cmds::Uniform2fv& cmd = *GetBufferAs<cmds::Uniform2fv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(11), - static_cast<GLsizei>(12), - static_cast<uint32_t>(13), - static_cast<uint32_t>(14)); - EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform2fv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLint>(11), cmd.location); - EXPECT_EQ(static_cast<GLsizei>(12), cmd.count); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, Uniform2fvImmediate) { const int kSomeBaseValueToTestWith = 51; static GLfloat data[] = { @@ -2068,23 +1853,6 @@ TEST_F(GLES2FormatTest, Uniform2i) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, Uniform2iv) { - cmds::Uniform2iv& cmd = *GetBufferAs<cmds::Uniform2iv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(11), - static_cast<GLsizei>(12), - static_cast<uint32_t>(13), - static_cast<uint32_t>(14)); - EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform2iv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLint>(11), cmd.location); - EXPECT_EQ(static_cast<GLsizei>(12), cmd.count); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, Uniform2ivImmediate) { const int kSomeBaseValueToTestWith = 51; static GLint data[] = { @@ -2125,23 +1893,6 @@ TEST_F(GLES2FormatTest, Uniform3f) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, Uniform3fv) { - cmds::Uniform3fv& cmd = *GetBufferAs<cmds::Uniform3fv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(11), - static_cast<GLsizei>(12), - static_cast<uint32_t>(13), - static_cast<uint32_t>(14)); - EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform3fv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLint>(11), cmd.location); - EXPECT_EQ(static_cast<GLsizei>(12), cmd.count); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, Uniform3fvImmediate) { const int kSomeBaseValueToTestWith = 51; static GLfloat data[] = { @@ -2184,23 +1935,6 @@ TEST_F(GLES2FormatTest, Uniform3i) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, Uniform3iv) { - cmds::Uniform3iv& cmd = *GetBufferAs<cmds::Uniform3iv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(11), - static_cast<GLsizei>(12), - static_cast<uint32_t>(13), - static_cast<uint32_t>(14)); - EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform3iv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLint>(11), cmd.location); - EXPECT_EQ(static_cast<GLsizei>(12), cmd.count); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, Uniform3ivImmediate) { const int kSomeBaseValueToTestWith = 51; static GLint data[] = { @@ -2245,23 +1979,6 @@ TEST_F(GLES2FormatTest, Uniform4f) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, Uniform4fv) { - cmds::Uniform4fv& cmd = *GetBufferAs<cmds::Uniform4fv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(11), - static_cast<GLsizei>(12), - static_cast<uint32_t>(13), - static_cast<uint32_t>(14)); - EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform4fv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLint>(11), cmd.location); - EXPECT_EQ(static_cast<GLsizei>(12), cmd.count); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, Uniform4fvImmediate) { const int kSomeBaseValueToTestWith = 51; static GLfloat data[] = { @@ -2308,23 +2025,6 @@ TEST_F(GLES2FormatTest, Uniform4i) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, Uniform4iv) { - cmds::Uniform4iv& cmd = *GetBufferAs<cmds::Uniform4iv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(11), - static_cast<GLsizei>(12), - static_cast<uint32_t>(13), - static_cast<uint32_t>(14)); - EXPECT_EQ(static_cast<uint32_t>(cmds::Uniform4iv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLint>(11), cmd.location); - EXPECT_EQ(static_cast<GLsizei>(12), cmd.count); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.v_shm_id); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.v_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, Uniform4ivImmediate) { const int kSomeBaseValueToTestWith = 51; static GLint data[] = { @@ -2353,25 +2053,6 @@ TEST_F(GLES2FormatTest, Uniform4ivImmediate) { // TODO(gman): Check that data was inserted; } -TEST_F(GLES2FormatTest, UniformMatrix2fv) { - cmds::UniformMatrix2fv& cmd = *GetBufferAs<cmds::UniformMatrix2fv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(11), - static_cast<GLsizei>(12), - static_cast<GLboolean>(13), - static_cast<uint32_t>(14), - static_cast<uint32_t>(15)); - EXPECT_EQ(static_cast<uint32_t>(cmds::UniformMatrix2fv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLint>(11), cmd.location); - EXPECT_EQ(static_cast<GLsizei>(12), cmd.count); - EXPECT_EQ(static_cast<GLboolean>(13), cmd.transpose); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.value_shm_id); - EXPECT_EQ(static_cast<uint32_t>(15), cmd.value_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, UniformMatrix2fvImmediate) { const int kSomeBaseValueToTestWith = 51; static GLfloat data[] = { @@ -2389,41 +2070,18 @@ TEST_F(GLES2FormatTest, UniformMatrix2fvImmediate) { const GLsizei kNumElements = 2; const size_t kExpectedCmdSize = sizeof(cmd) + kNumElements * sizeof(GLfloat) * 4; - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(1), - static_cast<GLsizei>(2), - static_cast<GLboolean>(3), - data); + void* next_cmd = + cmd.Set(&cmd, static_cast<GLint>(1), static_cast<GLsizei>(2), data); EXPECT_EQ(static_cast<uint32_t>(cmds::UniformMatrix2fvImmediate::kCmdId), cmd.header.command); EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u); EXPECT_EQ(static_cast<GLint>(1), cmd.location); EXPECT_EQ(static_cast<GLsizei>(2), cmd.count); - EXPECT_EQ(static_cast<GLboolean>(3), cmd.transpose); CheckBytesWrittenMatchesExpectedSize( next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data))); // TODO(gman): Check that data was inserted; } -TEST_F(GLES2FormatTest, UniformMatrix3fv) { - cmds::UniformMatrix3fv& cmd = *GetBufferAs<cmds::UniformMatrix3fv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(11), - static_cast<GLsizei>(12), - static_cast<GLboolean>(13), - static_cast<uint32_t>(14), - static_cast<uint32_t>(15)); - EXPECT_EQ(static_cast<uint32_t>(cmds::UniformMatrix3fv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLint>(11), cmd.location); - EXPECT_EQ(static_cast<GLsizei>(12), cmd.count); - EXPECT_EQ(static_cast<GLboolean>(13), cmd.transpose); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.value_shm_id); - EXPECT_EQ(static_cast<uint32_t>(15), cmd.value_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, UniformMatrix3fvImmediate) { const int kSomeBaseValueToTestWith = 51; static GLfloat data[] = { @@ -2451,41 +2109,18 @@ TEST_F(GLES2FormatTest, UniformMatrix3fvImmediate) { const GLsizei kNumElements = 2; const size_t kExpectedCmdSize = sizeof(cmd) + kNumElements * sizeof(GLfloat) * 9; - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(1), - static_cast<GLsizei>(2), - static_cast<GLboolean>(3), - data); + void* next_cmd = + cmd.Set(&cmd, static_cast<GLint>(1), static_cast<GLsizei>(2), data); EXPECT_EQ(static_cast<uint32_t>(cmds::UniformMatrix3fvImmediate::kCmdId), cmd.header.command); EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u); EXPECT_EQ(static_cast<GLint>(1), cmd.location); EXPECT_EQ(static_cast<GLsizei>(2), cmd.count); - EXPECT_EQ(static_cast<GLboolean>(3), cmd.transpose); CheckBytesWrittenMatchesExpectedSize( next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data))); // TODO(gman): Check that data was inserted; } -TEST_F(GLES2FormatTest, UniformMatrix4fv) { - cmds::UniformMatrix4fv& cmd = *GetBufferAs<cmds::UniformMatrix4fv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(11), - static_cast<GLsizei>(12), - static_cast<GLboolean>(13), - static_cast<uint32_t>(14), - static_cast<uint32_t>(15)); - EXPECT_EQ(static_cast<uint32_t>(cmds::UniformMatrix4fv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLint>(11), cmd.location); - EXPECT_EQ(static_cast<GLsizei>(12), cmd.count); - EXPECT_EQ(static_cast<GLboolean>(13), cmd.transpose); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.value_shm_id); - EXPECT_EQ(static_cast<uint32_t>(15), cmd.value_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, UniformMatrix4fvImmediate) { const int kSomeBaseValueToTestWith = 51; static GLfloat data[] = { @@ -2527,17 +2162,13 @@ TEST_F(GLES2FormatTest, UniformMatrix4fvImmediate) { const GLsizei kNumElements = 2; const size_t kExpectedCmdSize = sizeof(cmd) + kNumElements * sizeof(GLfloat) * 16; - void* next_cmd = cmd.Set(&cmd, - static_cast<GLint>(1), - static_cast<GLsizei>(2), - static_cast<GLboolean>(3), - data); + void* next_cmd = + cmd.Set(&cmd, static_cast<GLint>(1), static_cast<GLsizei>(2), data); EXPECT_EQ(static_cast<uint32_t>(cmds::UniformMatrix4fvImmediate::kCmdId), cmd.header.command); EXPECT_EQ(kExpectedCmdSize, cmd.header.size * 4u); EXPECT_EQ(static_cast<GLint>(1), cmd.location); EXPECT_EQ(static_cast<GLsizei>(2), cmd.count); - EXPECT_EQ(static_cast<GLboolean>(3), cmd.transpose); CheckBytesWrittenMatchesExpectedSize( next_cmd, sizeof(cmd) + RoundSizeToMultipleOfEntries(sizeof(data))); // TODO(gman): Check that data was inserted; @@ -2575,21 +2206,6 @@ TEST_F(GLES2FormatTest, VertexAttrib1f) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, VertexAttrib1fv) { - cmds::VertexAttrib1fv& cmd = *GetBufferAs<cmds::VertexAttrib1fv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLuint>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib1fv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLuint>(11), cmd.indx); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.values_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.values_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, VertexAttrib1fvImmediate) { const int kSomeBaseValueToTestWith = 51; static GLfloat data[] = { @@ -2623,21 +2239,6 @@ TEST_F(GLES2FormatTest, VertexAttrib2f) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, VertexAttrib2fv) { - cmds::VertexAttrib2fv& cmd = *GetBufferAs<cmds::VertexAttrib2fv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLuint>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib2fv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLuint>(11), cmd.indx); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.values_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.values_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, VertexAttrib2fvImmediate) { const int kSomeBaseValueToTestWith = 51; static GLfloat data[] = { @@ -2674,21 +2275,6 @@ TEST_F(GLES2FormatTest, VertexAttrib3f) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, VertexAttrib3fv) { - cmds::VertexAttrib3fv& cmd = *GetBufferAs<cmds::VertexAttrib3fv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLuint>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib3fv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLuint>(11), cmd.indx); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.values_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.values_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, VertexAttrib3fvImmediate) { const int kSomeBaseValueToTestWith = 51; static GLfloat data[] = { @@ -2728,21 +2314,6 @@ TEST_F(GLES2FormatTest, VertexAttrib4f) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, VertexAttrib4fv) { - cmds::VertexAttrib4fv& cmd = *GetBufferAs<cmds::VertexAttrib4fv>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLuint>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::VertexAttrib4fv::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLuint>(11), cmd.indx); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.values_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.values_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, VertexAttrib4fvImmediate) { const int kSomeBaseValueToTestWith = 51; static GLfloat data[] = { @@ -2881,8 +2452,7 @@ TEST_F(GLES2FormatTest, FramebufferTexture2DMultisampleEXT) { static_cast<GLenum>(12), static_cast<GLenum>(13), static_cast<GLuint>(14), - static_cast<GLint>(15), - static_cast<GLsizei>(16)); + static_cast<GLsizei>(15)); EXPECT_EQ( static_cast<uint32_t>(cmds::FramebufferTexture2DMultisampleEXT::kCmdId), cmd.header.command); @@ -2891,8 +2461,7 @@ TEST_F(GLES2FormatTest, FramebufferTexture2DMultisampleEXT) { EXPECT_EQ(static_cast<GLenum>(12), cmd.attachment); EXPECT_EQ(static_cast<GLenum>(13), cmd.textarget); EXPECT_EQ(static_cast<GLuint>(14), cmd.texture); - EXPECT_EQ(static_cast<GLint>(15), cmd.level); - EXPECT_EQ(static_cast<GLsizei>(16), cmd.samples); + EXPECT_EQ(static_cast<GLsizei>(15), cmd.samples); CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } @@ -2915,21 +2484,6 @@ TEST_F(GLES2FormatTest, TexStorage2DEXT) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, GenQueriesEXT) { - cmds::GenQueriesEXT& cmd = *GetBufferAs<cmds::GenQueriesEXT>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::GenQueriesEXT::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.n); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.queries_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.queries_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, GenQueriesEXTImmediate) { static GLuint ids[] = { 12, 23, 34, @@ -2948,21 +2502,6 @@ TEST_F(GLES2FormatTest, GenQueriesEXTImmediate) { // TODO(gman): Check that ids were inserted; } -TEST_F(GLES2FormatTest, DeleteQueriesEXT) { - cmds::DeleteQueriesEXT& cmd = *GetBufferAs<cmds::DeleteQueriesEXT>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteQueriesEXT::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.n); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.queries_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.queries_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, DeleteQueriesEXTImmediate) { static GLuint ids[] = { 12, 23, 34, @@ -3039,21 +2578,6 @@ TEST_F(GLES2FormatTest, PopGroupMarkerEXT) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, GenVertexArraysOES) { - cmds::GenVertexArraysOES& cmd = *GetBufferAs<cmds::GenVertexArraysOES>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::GenVertexArraysOES::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.n); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.arrays_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.arrays_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, GenVertexArraysOESImmediate) { static GLuint ids[] = { 12, 23, 34, @@ -3072,22 +2596,6 @@ TEST_F(GLES2FormatTest, GenVertexArraysOESImmediate) { // TODO(gman): Check that ids were inserted; } -TEST_F(GLES2FormatTest, DeleteVertexArraysOES) { - cmds::DeleteVertexArraysOES& cmd = - *GetBufferAs<cmds::DeleteVertexArraysOES>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::DeleteVertexArraysOES::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.n); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.arrays_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.arrays_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, DeleteVertexArraysOESImmediate) { static GLuint ids[] = { 12, 23, 34, @@ -3430,22 +2938,6 @@ TEST_F(GLES2FormatTest, VertexAttribDivisorANGLE) { } // TODO(gman): Write test for GenMailboxCHROMIUM -TEST_F(GLES2FormatTest, ProduceTextureCHROMIUM) { - cmds::ProduceTextureCHROMIUM& cmd = - *GetBufferAs<cmds::ProduceTextureCHROMIUM>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLenum>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::ProduceTextureCHROMIUM::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLenum>(11), cmd.target); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.mailbox_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.mailbox_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, ProduceTextureCHROMIUMImmediate) { const int kSomeBaseValueToTestWith = 51; static GLbyte data[] = { @@ -3528,22 +3020,6 @@ TEST_F(GLES2FormatTest, ProduceTextureCHROMIUMImmediate) { // TODO(gman): Check that data was inserted; } -TEST_F(GLES2FormatTest, ConsumeTextureCHROMIUM) { - cmds::ConsumeTextureCHROMIUM& cmd = - *GetBufferAs<cmds::ConsumeTextureCHROMIUM>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLenum>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::ConsumeTextureCHROMIUM::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLenum>(11), cmd.target); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.mailbox_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.mailbox_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, ConsumeTextureCHROMIUMImmediate) { const int kSomeBaseValueToTestWith = 51; static GLbyte data[] = { @@ -3753,14 +3229,13 @@ TEST_F(GLES2FormatTest, AsyncTexImage2DCHROMIUM) { static_cast<GLint>(13), static_cast<GLsizei>(14), static_cast<GLsizei>(15), - static_cast<GLint>(16), + static_cast<GLenum>(16), static_cast<GLenum>(17), - static_cast<GLenum>(18), + static_cast<uint32_t>(18), static_cast<uint32_t>(19), static_cast<uint32_t>(20), static_cast<uint32_t>(21), - static_cast<uint32_t>(22), - static_cast<uint32_t>(23)); + static_cast<uint32_t>(22)); EXPECT_EQ(static_cast<uint32_t>(cmds::AsyncTexImage2DCHROMIUM::kCmdId), cmd.header.command); EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); @@ -3769,14 +3244,13 @@ TEST_F(GLES2FormatTest, AsyncTexImage2DCHROMIUM) { EXPECT_EQ(static_cast<GLint>(13), cmd.internalformat); EXPECT_EQ(static_cast<GLsizei>(14), cmd.width); EXPECT_EQ(static_cast<GLsizei>(15), cmd.height); - EXPECT_EQ(static_cast<GLint>(16), cmd.border); - EXPECT_EQ(static_cast<GLenum>(17), cmd.format); - EXPECT_EQ(static_cast<GLenum>(18), cmd.type); - EXPECT_EQ(static_cast<uint32_t>(19), cmd.pixels_shm_id); - EXPECT_EQ(static_cast<uint32_t>(20), cmd.pixels_shm_offset); - EXPECT_EQ(static_cast<uint32_t>(21), cmd.async_upload_token); - EXPECT_EQ(static_cast<uint32_t>(22), cmd.sync_data_shm_id); - EXPECT_EQ(static_cast<uint32_t>(23), cmd.sync_data_shm_offset); + EXPECT_EQ(static_cast<GLenum>(16), cmd.format); + EXPECT_EQ(static_cast<GLenum>(17), cmd.type); + EXPECT_EQ(static_cast<uint32_t>(18), cmd.pixels_shm_id); + EXPECT_EQ(static_cast<uint32_t>(19), cmd.pixels_shm_offset); + EXPECT_EQ(static_cast<uint32_t>(20), cmd.async_upload_token); + EXPECT_EQ(static_cast<uint32_t>(21), cmd.sync_data_shm_id); + EXPECT_EQ(static_cast<uint32_t>(22), cmd.sync_data_shm_offset); CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } @@ -3801,24 +3275,6 @@ TEST_F(GLES2FormatTest, WaitAllAsyncTexImage2DCHROMIUM) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, DiscardFramebufferEXT) { - cmds::DiscardFramebufferEXT& cmd = - *GetBufferAs<cmds::DiscardFramebufferEXT>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLenum>(11), - static_cast<GLsizei>(12), - static_cast<uint32_t>(13), - static_cast<uint32_t>(14)); - EXPECT_EQ(static_cast<uint32_t>(cmds::DiscardFramebufferEXT::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLenum>(11), cmd.target); - EXPECT_EQ(static_cast<GLsizei>(12), cmd.count); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.attachments_shm_id); - EXPECT_EQ(static_cast<uint32_t>(14), cmd.attachments_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, DiscardFramebufferEXTImmediate) { const int kSomeBaseValueToTestWith = 51; static GLenum data[] = { @@ -3866,21 +3322,6 @@ TEST_F(GLES2FormatTest, WaitSyncPointCHROMIUM) { CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); } -TEST_F(GLES2FormatTest, DrawBuffersEXT) { - cmds::DrawBuffersEXT& cmd = *GetBufferAs<cmds::DrawBuffersEXT>(); - void* next_cmd = cmd.Set(&cmd, - static_cast<GLsizei>(11), - static_cast<uint32_t>(12), - static_cast<uint32_t>(13)); - EXPECT_EQ(static_cast<uint32_t>(cmds::DrawBuffersEXT::kCmdId), - cmd.header.command); - EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u); - EXPECT_EQ(static_cast<GLsizei>(11), cmd.count); - EXPECT_EQ(static_cast<uint32_t>(12), cmd.bufs_shm_id); - EXPECT_EQ(static_cast<uint32_t>(13), cmd.bufs_shm_offset); - CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd)); -} - TEST_F(GLES2FormatTest, DrawBuffersEXTImmediate) { const int kSomeBaseValueToTestWith = 51; static GLenum data[] = { diff --git a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h index aed4e772c8..c10d82974d 100644 --- a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h +++ b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h @@ -43,210 +43,177 @@ OP(CreateProgram) /* 284 */ \ OP(CreateShader) /* 285 */ \ OP(CullFace) /* 286 */ \ - OP(DeleteBuffers) /* 287 */ \ - OP(DeleteBuffersImmediate) /* 288 */ \ - OP(DeleteFramebuffers) /* 289 */ \ - OP(DeleteFramebuffersImmediate) /* 290 */ \ - OP(DeleteProgram) /* 291 */ \ - OP(DeleteRenderbuffers) /* 292 */ \ - OP(DeleteRenderbuffersImmediate) /* 293 */ \ - OP(DeleteShader) /* 294 */ \ - OP(DeleteTextures) /* 295 */ \ - OP(DeleteTexturesImmediate) /* 296 */ \ - OP(DepthFunc) /* 297 */ \ - OP(DepthMask) /* 298 */ \ - OP(DepthRangef) /* 299 */ \ - OP(DetachShader) /* 300 */ \ - OP(Disable) /* 301 */ \ - OP(DisableVertexAttribArray) /* 302 */ \ - OP(DrawArrays) /* 303 */ \ - OP(DrawElements) /* 304 */ \ - OP(Enable) /* 305 */ \ - OP(EnableVertexAttribArray) /* 306 */ \ - OP(Finish) /* 307 */ \ - OP(Flush) /* 308 */ \ - OP(FramebufferRenderbuffer) /* 309 */ \ - OP(FramebufferTexture2D) /* 310 */ \ - OP(FrontFace) /* 311 */ \ - OP(GenBuffers) /* 312 */ \ - OP(GenBuffersImmediate) /* 313 */ \ - OP(GenerateMipmap) /* 314 */ \ - OP(GenFramebuffers) /* 315 */ \ - OP(GenFramebuffersImmediate) /* 316 */ \ - OP(GenRenderbuffers) /* 317 */ \ - OP(GenRenderbuffersImmediate) /* 318 */ \ - OP(GenTextures) /* 319 */ \ - OP(GenTexturesImmediate) /* 320 */ \ - OP(GetActiveAttrib) /* 321 */ \ - OP(GetActiveUniform) /* 322 */ \ - OP(GetAttachedShaders) /* 323 */ \ - OP(GetAttribLocation) /* 324 */ \ - OP(GetAttribLocationBucket) /* 325 */ \ - OP(GetBooleanv) /* 326 */ \ - OP(GetBufferParameteriv) /* 327 */ \ - OP(GetError) /* 328 */ \ - OP(GetFloatv) /* 329 */ \ - OP(GetFramebufferAttachmentParameteriv) /* 330 */ \ - OP(GetIntegerv) /* 331 */ \ - OP(GetProgramiv) /* 332 */ \ - OP(GetProgramInfoLog) /* 333 */ \ - OP(GetRenderbufferParameteriv) /* 334 */ \ - OP(GetShaderiv) /* 335 */ \ - OP(GetShaderInfoLog) /* 336 */ \ - OP(GetShaderPrecisionFormat) /* 337 */ \ - OP(GetShaderSource) /* 338 */ \ - OP(GetString) /* 339 */ \ - OP(GetTexParameterfv) /* 340 */ \ - OP(GetTexParameteriv) /* 341 */ \ - OP(GetUniformfv) /* 342 */ \ - OP(GetUniformiv) /* 343 */ \ - OP(GetUniformLocation) /* 344 */ \ - OP(GetUniformLocationBucket) /* 345 */ \ - OP(GetVertexAttribfv) /* 346 */ \ - OP(GetVertexAttribiv) /* 347 */ \ - OP(GetVertexAttribPointerv) /* 348 */ \ - OP(Hint) /* 349 */ \ - OP(IsBuffer) /* 350 */ \ - OP(IsEnabled) /* 351 */ \ - OP(IsFramebuffer) /* 352 */ \ - OP(IsProgram) /* 353 */ \ - OP(IsRenderbuffer) /* 354 */ \ - OP(IsShader) /* 355 */ \ - OP(IsTexture) /* 356 */ \ - OP(LineWidth) /* 357 */ \ - OP(LinkProgram) /* 358 */ \ - OP(PixelStorei) /* 359 */ \ - OP(PolygonOffset) /* 360 */ \ - OP(ReadPixels) /* 361 */ \ - OP(ReleaseShaderCompiler) /* 362 */ \ - OP(RenderbufferStorage) /* 363 */ \ - OP(SampleCoverage) /* 364 */ \ - OP(Scissor) /* 365 */ \ - OP(ShaderBinary) /* 366 */ \ - OP(ShaderSource) /* 367 */ \ - OP(ShaderSourceBucket) /* 368 */ \ - OP(StencilFunc) /* 369 */ \ - OP(StencilFuncSeparate) /* 370 */ \ - OP(StencilMask) /* 371 */ \ - OP(StencilMaskSeparate) /* 372 */ \ - OP(StencilOp) /* 373 */ \ - OP(StencilOpSeparate) /* 374 */ \ - OP(TexImage2D) /* 375 */ \ - OP(TexParameterf) /* 376 */ \ - OP(TexParameterfv) /* 377 */ \ - OP(TexParameterfvImmediate) /* 378 */ \ - OP(TexParameteri) /* 379 */ \ - OP(TexParameteriv) /* 380 */ \ - OP(TexParameterivImmediate) /* 381 */ \ - OP(TexSubImage2D) /* 382 */ \ - OP(Uniform1f) /* 383 */ \ - OP(Uniform1fv) /* 384 */ \ - OP(Uniform1fvImmediate) /* 385 */ \ - OP(Uniform1i) /* 386 */ \ - OP(Uniform1iv) /* 387 */ \ - OP(Uniform1ivImmediate) /* 388 */ \ - OP(Uniform2f) /* 389 */ \ - OP(Uniform2fv) /* 390 */ \ - OP(Uniform2fvImmediate) /* 391 */ \ - OP(Uniform2i) /* 392 */ \ - OP(Uniform2iv) /* 393 */ \ - OP(Uniform2ivImmediate) /* 394 */ \ - OP(Uniform3f) /* 395 */ \ - OP(Uniform3fv) /* 396 */ \ - OP(Uniform3fvImmediate) /* 397 */ \ - OP(Uniform3i) /* 398 */ \ - OP(Uniform3iv) /* 399 */ \ - OP(Uniform3ivImmediate) /* 400 */ \ - OP(Uniform4f) /* 401 */ \ - OP(Uniform4fv) /* 402 */ \ - OP(Uniform4fvImmediate) /* 403 */ \ - OP(Uniform4i) /* 404 */ \ - OP(Uniform4iv) /* 405 */ \ - OP(Uniform4ivImmediate) /* 406 */ \ - OP(UniformMatrix2fv) /* 407 */ \ - OP(UniformMatrix2fvImmediate) /* 408 */ \ - OP(UniformMatrix3fv) /* 409 */ \ - OP(UniformMatrix3fvImmediate) /* 410 */ \ - OP(UniformMatrix4fv) /* 411 */ \ - OP(UniformMatrix4fvImmediate) /* 412 */ \ - OP(UseProgram) /* 413 */ \ - OP(ValidateProgram) /* 414 */ \ - OP(VertexAttrib1f) /* 415 */ \ - OP(VertexAttrib1fv) /* 416 */ \ - OP(VertexAttrib1fvImmediate) /* 417 */ \ - OP(VertexAttrib2f) /* 418 */ \ - OP(VertexAttrib2fv) /* 419 */ \ - OP(VertexAttrib2fvImmediate) /* 420 */ \ - OP(VertexAttrib3f) /* 421 */ \ - OP(VertexAttrib3fv) /* 422 */ \ - OP(VertexAttrib3fvImmediate) /* 423 */ \ - OP(VertexAttrib4f) /* 424 */ \ - OP(VertexAttrib4fv) /* 425 */ \ - OP(VertexAttrib4fvImmediate) /* 426 */ \ - OP(VertexAttribPointer) /* 427 */ \ - OP(Viewport) /* 428 */ \ - OP(BlitFramebufferCHROMIUM) /* 429 */ \ - OP(RenderbufferStorageMultisampleCHROMIUM) /* 430 */ \ - OP(RenderbufferStorageMultisampleEXT) /* 431 */ \ - OP(FramebufferTexture2DMultisampleEXT) /* 432 */ \ - OP(TexStorage2DEXT) /* 433 */ \ - OP(GenQueriesEXT) /* 434 */ \ - OP(GenQueriesEXTImmediate) /* 435 */ \ - OP(DeleteQueriesEXT) /* 436 */ \ - OP(DeleteQueriesEXTImmediate) /* 437 */ \ - OP(BeginQueryEXT) /* 438 */ \ - OP(EndQueryEXT) /* 439 */ \ - OP(InsertEventMarkerEXT) /* 440 */ \ - OP(PushGroupMarkerEXT) /* 441 */ \ - OP(PopGroupMarkerEXT) /* 442 */ \ - OP(GenVertexArraysOES) /* 443 */ \ - OP(GenVertexArraysOESImmediate) /* 444 */ \ - OP(DeleteVertexArraysOES) /* 445 */ \ - OP(DeleteVertexArraysOESImmediate) /* 446 */ \ - OP(IsVertexArrayOES) /* 447 */ \ - OP(BindVertexArrayOES) /* 448 */ \ - OP(SwapBuffers) /* 449 */ \ - OP(GetMaxValueInBufferCHROMIUM) /* 450 */ \ - OP(GenSharedIdsCHROMIUM) /* 451 */ \ - OP(DeleteSharedIdsCHROMIUM) /* 452 */ \ - OP(RegisterSharedIdsCHROMIUM) /* 453 */ \ - OP(EnableFeatureCHROMIUM) /* 454 */ \ - OP(ResizeCHROMIUM) /* 455 */ \ - OP(GetRequestableExtensionsCHROMIUM) /* 456 */ \ - OP(RequestExtensionCHROMIUM) /* 457 */ \ - OP(GetMultipleIntegervCHROMIUM) /* 458 */ \ - OP(GetProgramInfoCHROMIUM) /* 459 */ \ - OP(GetTranslatedShaderSourceANGLE) /* 460 */ \ - OP(PostSubBufferCHROMIUM) /* 461 */ \ - OP(TexImageIOSurface2DCHROMIUM) /* 462 */ \ - OP(CopyTextureCHROMIUM) /* 463 */ \ - OP(DrawArraysInstancedANGLE) /* 464 */ \ - OP(DrawElementsInstancedANGLE) /* 465 */ \ - OP(VertexAttribDivisorANGLE) /* 466 */ \ - OP(GenMailboxCHROMIUM) /* 467 */ \ - OP(ProduceTextureCHROMIUM) /* 468 */ \ - OP(ProduceTextureCHROMIUMImmediate) /* 469 */ \ - OP(ConsumeTextureCHROMIUM) /* 470 */ \ - OP(ConsumeTextureCHROMIUMImmediate) /* 471 */ \ - OP(BindUniformLocationCHROMIUM) /* 472 */ \ - OP(BindUniformLocationCHROMIUMBucket) /* 473 */ \ - OP(BindTexImage2DCHROMIUM) /* 474 */ \ - OP(ReleaseTexImage2DCHROMIUM) /* 475 */ \ - OP(TraceBeginCHROMIUM) /* 476 */ \ - OP(TraceEndCHROMIUM) /* 477 */ \ - OP(AsyncTexSubImage2DCHROMIUM) /* 478 */ \ - OP(AsyncTexImage2DCHROMIUM) /* 479 */ \ - OP(WaitAsyncTexImage2DCHROMIUM) /* 480 */ \ - OP(WaitAllAsyncTexImage2DCHROMIUM) /* 481 */ \ - OP(DiscardFramebufferEXT) /* 482 */ \ - OP(DiscardFramebufferEXTImmediate) /* 483 */ \ - OP(LoseContextCHROMIUM) /* 484 */ \ - OP(InsertSyncPointCHROMIUM) /* 485 */ \ - OP(WaitSyncPointCHROMIUM) /* 486 */ \ - OP(DrawBuffersEXT) /* 487 */ \ - OP(DrawBuffersEXTImmediate) /* 488 */ \ - OP(DiscardBackbufferCHROMIUM) /* 489 */ \ - OP(ScheduleOverlayPlaneCHROMIUM) /* 490 */ + OP(DeleteBuffersImmediate) /* 287 */ \ + OP(DeleteFramebuffersImmediate) /* 288 */ \ + OP(DeleteProgram) /* 289 */ \ + OP(DeleteRenderbuffersImmediate) /* 290 */ \ + OP(DeleteShader) /* 291 */ \ + OP(DeleteTexturesImmediate) /* 292 */ \ + OP(DepthFunc) /* 293 */ \ + OP(DepthMask) /* 294 */ \ + OP(DepthRangef) /* 295 */ \ + OP(DetachShader) /* 296 */ \ + OP(Disable) /* 297 */ \ + OP(DisableVertexAttribArray) /* 298 */ \ + OP(DrawArrays) /* 299 */ \ + OP(DrawElements) /* 300 */ \ + OP(Enable) /* 301 */ \ + OP(EnableVertexAttribArray) /* 302 */ \ + OP(Finish) /* 303 */ \ + OP(Flush) /* 304 */ \ + OP(FramebufferRenderbuffer) /* 305 */ \ + OP(FramebufferTexture2D) /* 306 */ \ + OP(FrontFace) /* 307 */ \ + OP(GenBuffersImmediate) /* 308 */ \ + OP(GenerateMipmap) /* 309 */ \ + OP(GenFramebuffersImmediate) /* 310 */ \ + OP(GenRenderbuffersImmediate) /* 311 */ \ + OP(GenTexturesImmediate) /* 312 */ \ + OP(GetActiveAttrib) /* 313 */ \ + OP(GetActiveUniform) /* 314 */ \ + OP(GetAttachedShaders) /* 315 */ \ + OP(GetAttribLocation) /* 316 */ \ + OP(GetAttribLocationBucket) /* 317 */ \ + OP(GetBooleanv) /* 318 */ \ + OP(GetBufferParameteriv) /* 319 */ \ + OP(GetError) /* 320 */ \ + OP(GetFloatv) /* 321 */ \ + OP(GetFramebufferAttachmentParameteriv) /* 322 */ \ + OP(GetIntegerv) /* 323 */ \ + OP(GetProgramiv) /* 324 */ \ + OP(GetProgramInfoLog) /* 325 */ \ + OP(GetRenderbufferParameteriv) /* 326 */ \ + OP(GetShaderiv) /* 327 */ \ + OP(GetShaderInfoLog) /* 328 */ \ + OP(GetShaderPrecisionFormat) /* 329 */ \ + OP(GetShaderSource) /* 330 */ \ + OP(GetString) /* 331 */ \ + OP(GetTexParameterfv) /* 332 */ \ + OP(GetTexParameteriv) /* 333 */ \ + OP(GetUniformfv) /* 334 */ \ + OP(GetUniformiv) /* 335 */ \ + OP(GetUniformLocation) /* 336 */ \ + OP(GetUniformLocationBucket) /* 337 */ \ + OP(GetVertexAttribfv) /* 338 */ \ + OP(GetVertexAttribiv) /* 339 */ \ + OP(GetVertexAttribPointerv) /* 340 */ \ + OP(Hint) /* 341 */ \ + OP(IsBuffer) /* 342 */ \ + OP(IsEnabled) /* 343 */ \ + OP(IsFramebuffer) /* 344 */ \ + OP(IsProgram) /* 345 */ \ + OP(IsRenderbuffer) /* 346 */ \ + OP(IsShader) /* 347 */ \ + OP(IsTexture) /* 348 */ \ + OP(LineWidth) /* 349 */ \ + OP(LinkProgram) /* 350 */ \ + OP(PixelStorei) /* 351 */ \ + OP(PolygonOffset) /* 352 */ \ + OP(ReadPixels) /* 353 */ \ + OP(ReleaseShaderCompiler) /* 354 */ \ + OP(RenderbufferStorage) /* 355 */ \ + OP(SampleCoverage) /* 356 */ \ + OP(Scissor) /* 357 */ \ + OP(ShaderBinary) /* 358 */ \ + OP(ShaderSource) /* 359 */ \ + OP(ShaderSourceBucket) /* 360 */ \ + OP(StencilFunc) /* 361 */ \ + OP(StencilFuncSeparate) /* 362 */ \ + OP(StencilMask) /* 363 */ \ + OP(StencilMaskSeparate) /* 364 */ \ + OP(StencilOp) /* 365 */ \ + OP(StencilOpSeparate) /* 366 */ \ + OP(TexImage2D) /* 367 */ \ + OP(TexParameterf) /* 368 */ \ + OP(TexParameterfvImmediate) /* 369 */ \ + OP(TexParameteri) /* 370 */ \ + OP(TexParameterivImmediate) /* 371 */ \ + OP(TexSubImage2D) /* 372 */ \ + OP(Uniform1f) /* 373 */ \ + OP(Uniform1fvImmediate) /* 374 */ \ + OP(Uniform1i) /* 375 */ \ + OP(Uniform1ivImmediate) /* 376 */ \ + OP(Uniform2f) /* 377 */ \ + OP(Uniform2fvImmediate) /* 378 */ \ + OP(Uniform2i) /* 379 */ \ + OP(Uniform2ivImmediate) /* 380 */ \ + OP(Uniform3f) /* 381 */ \ + OP(Uniform3fvImmediate) /* 382 */ \ + OP(Uniform3i) /* 383 */ \ + OP(Uniform3ivImmediate) /* 384 */ \ + OP(Uniform4f) /* 385 */ \ + OP(Uniform4fvImmediate) /* 386 */ \ + OP(Uniform4i) /* 387 */ \ + OP(Uniform4ivImmediate) /* 388 */ \ + OP(UniformMatrix2fvImmediate) /* 389 */ \ + OP(UniformMatrix3fvImmediate) /* 390 */ \ + OP(UniformMatrix4fvImmediate) /* 391 */ \ + OP(UseProgram) /* 392 */ \ + OP(ValidateProgram) /* 393 */ \ + OP(VertexAttrib1f) /* 394 */ \ + OP(VertexAttrib1fvImmediate) /* 395 */ \ + OP(VertexAttrib2f) /* 396 */ \ + OP(VertexAttrib2fvImmediate) /* 397 */ \ + OP(VertexAttrib3f) /* 398 */ \ + OP(VertexAttrib3fvImmediate) /* 399 */ \ + OP(VertexAttrib4f) /* 400 */ \ + OP(VertexAttrib4fvImmediate) /* 401 */ \ + OP(VertexAttribPointer) /* 402 */ \ + OP(Viewport) /* 403 */ \ + OP(BlitFramebufferCHROMIUM) /* 404 */ \ + OP(RenderbufferStorageMultisampleCHROMIUM) /* 405 */ \ + OP(RenderbufferStorageMultisampleEXT) /* 406 */ \ + OP(FramebufferTexture2DMultisampleEXT) /* 407 */ \ + OP(TexStorage2DEXT) /* 408 */ \ + OP(GenQueriesEXTImmediate) /* 409 */ \ + OP(DeleteQueriesEXTImmediate) /* 410 */ \ + OP(BeginQueryEXT) /* 411 */ \ + OP(EndQueryEXT) /* 412 */ \ + OP(InsertEventMarkerEXT) /* 413 */ \ + OP(PushGroupMarkerEXT) /* 414 */ \ + OP(PopGroupMarkerEXT) /* 415 */ \ + OP(GenVertexArraysOESImmediate) /* 416 */ \ + OP(DeleteVertexArraysOESImmediate) /* 417 */ \ + OP(IsVertexArrayOES) /* 418 */ \ + OP(BindVertexArrayOES) /* 419 */ \ + OP(SwapBuffers) /* 420 */ \ + OP(GetMaxValueInBufferCHROMIUM) /* 421 */ \ + OP(GenSharedIdsCHROMIUM) /* 422 */ \ + OP(DeleteSharedIdsCHROMIUM) /* 423 */ \ + OP(RegisterSharedIdsCHROMIUM) /* 424 */ \ + OP(EnableFeatureCHROMIUM) /* 425 */ \ + OP(ResizeCHROMIUM) /* 426 */ \ + OP(GetRequestableExtensionsCHROMIUM) /* 427 */ \ + OP(RequestExtensionCHROMIUM) /* 428 */ \ + OP(GetMultipleIntegervCHROMIUM) /* 429 */ \ + OP(GetProgramInfoCHROMIUM) /* 430 */ \ + OP(GetTranslatedShaderSourceANGLE) /* 431 */ \ + OP(PostSubBufferCHROMIUM) /* 432 */ \ + OP(TexImageIOSurface2DCHROMIUM) /* 433 */ \ + OP(CopyTextureCHROMIUM) /* 434 */ \ + OP(DrawArraysInstancedANGLE) /* 435 */ \ + OP(DrawElementsInstancedANGLE) /* 436 */ \ + OP(VertexAttribDivisorANGLE) /* 437 */ \ + OP(GenMailboxCHROMIUM) /* 438 */ \ + OP(ProduceTextureCHROMIUMImmediate) /* 439 */ \ + OP(ConsumeTextureCHROMIUMImmediate) /* 440 */ \ + OP(BindUniformLocationCHROMIUM) /* 441 */ \ + OP(BindUniformLocationCHROMIUMBucket) /* 442 */ \ + OP(BindTexImage2DCHROMIUM) /* 443 */ \ + OP(ReleaseTexImage2DCHROMIUM) /* 444 */ \ + OP(TraceBeginCHROMIUM) /* 445 */ \ + OP(TraceEndCHROMIUM) /* 446 */ \ + OP(AsyncTexSubImage2DCHROMIUM) /* 447 */ \ + OP(AsyncTexImage2DCHROMIUM) /* 448 */ \ + OP(WaitAsyncTexImage2DCHROMIUM) /* 449 */ \ + OP(WaitAllAsyncTexImage2DCHROMIUM) /* 450 */ \ + OP(DiscardFramebufferEXTImmediate) /* 451 */ \ + OP(LoseContextCHROMIUM) /* 452 */ \ + OP(InsertSyncPointCHROMIUM) /* 453 */ \ + OP(WaitSyncPointCHROMIUM) /* 454 */ \ + OP(DrawBuffersEXTImmediate) /* 455 */ \ + OP(DiscardBackbufferCHROMIUM) /* 456 */ \ + OP(ScheduleOverlayPlaneCHROMIUM) /* 457 */ enum CommandId { kStartPoint = cmd::kLastCommonId, // All GLES2 commands start after this. 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 14800baf26..b3ec421826 100644 --- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h +++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h @@ -2603,17 +2603,10 @@ std::string GLES2Util::GetStringGLState(uint32_t value) { {GL_CULL_FACE_MODE, "GL_CULL_FACE_MODE"}, {GL_DEPTH_FUNC, "GL_DEPTH_FUNC"}, {GL_DEPTH_WRITEMASK, "GL_DEPTH_WRITEMASK"}, - {GL_DEPTH_RANGE, "GL_DEPTH_RANGE"}, {GL_FRONT_FACE, "GL_FRONT_FACE"}, - {GL_GENERATE_MIPMAP_HINT, "GL_GENERATE_MIPMAP_HINT"}, {GL_LINE_WIDTH, "GL_LINE_WIDTH"}, - {GL_PACK_ALIGNMENT, "GL_PACK_ALIGNMENT"}, - {GL_UNPACK_ALIGNMENT, "GL_UNPACK_ALIGNMENT"}, {GL_POLYGON_OFFSET_FACTOR, "GL_POLYGON_OFFSET_FACTOR"}, {GL_POLYGON_OFFSET_UNITS, "GL_POLYGON_OFFSET_UNITS"}, - {GL_SAMPLE_COVERAGE_VALUE, "GL_SAMPLE_COVERAGE_VALUE"}, - {GL_SAMPLE_COVERAGE_INVERT, "GL_SAMPLE_COVERAGE_INVERT"}, - {GL_SCISSOR_BOX, "GL_SCISSOR_BOX"}, {GL_STENCIL_FUNC, "GL_STENCIL_FUNC"}, {GL_STENCIL_REF, "GL_STENCIL_REF"}, {GL_STENCIL_VALUE_MASK, "GL_STENCIL_VALUE_MASK"}, @@ -2628,7 +2621,6 @@ std::string GLES2Util::GetStringGLState(uint32_t value) { {GL_STENCIL_BACK_FAIL, "GL_STENCIL_BACK_FAIL"}, {GL_STENCIL_BACK_PASS_DEPTH_FAIL, "GL_STENCIL_BACK_PASS_DEPTH_FAIL"}, {GL_STENCIL_BACK_PASS_DEPTH_PASS, "GL_STENCIL_BACK_PASS_DEPTH_PASS"}, - {GL_VIEWPORT, "GL_VIEWPORT"}, {GL_BLEND, "GL_BLEND"}, {GL_CULL_FACE, "GL_CULL_FACE"}, {GL_DEPTH_TEST, "GL_DEPTH_TEST"}, diff --git a/gpu/command_buffer/gles2_utils.target.darwin-arm.mk b/gpu/command_buffer/gles2_utils.target.darwin-arm.mk index b6cb592496..a23c9404ef 100644 --- a/gpu/command_buffer/gles2_utils.target.darwin-arm.mk +++ b/gpu/command_buffer/gles2_utils.target.darwin-arm.mk @@ -41,7 +41,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -73,12 +80,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -130,7 +142,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -162,12 +181,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer/gles2_utils.target.darwin-arm64.mk b/gpu/command_buffer/gles2_utils.target.darwin-arm64.mk index 6c2cbdba6a..2d44942367 100644 --- a/gpu/command_buffer/gles2_utils.target.darwin-arm64.mk +++ b/gpu/command_buffer/gles2_utils.target.darwin-arm64.mk @@ -70,12 +70,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -155,12 +160,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer/gles2_utils.target.darwin-mips.mk b/gpu/command_buffer/gles2_utils.target.darwin-mips.mk index e661a656ce..f9bfe3ef39 100644 --- a/gpu/command_buffer/gles2_utils.target.darwin-mips.mk +++ b/gpu/command_buffer/gles2_utils.target.darwin-mips.mk @@ -41,6 +41,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -73,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -130,6 +136,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -162,12 +169,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer/gles2_utils.target.darwin-x86.mk b/gpu/command_buffer/gles2_utils.target.darwin-x86.mk index 221e2e5879..17650a6582 100644 --- a/gpu/command_buffer/gles2_utils.target.darwin-x86.mk +++ b/gpu/command_buffer/gles2_utils.target.darwin-x86.mk @@ -40,6 +40,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -74,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -129,6 +135,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -163,12 +170,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer/gles2_utils.target.darwin-x86_64.mk b/gpu/command_buffer/gles2_utils.target.darwin-x86_64.mk index 1e21cbbc11..666c3a70f3 100644 --- a/gpu/command_buffer/gles2_utils.target.darwin-x86_64.mk +++ b/gpu/command_buffer/gles2_utils.target.darwin-x86_64.mk @@ -74,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -163,12 +168,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer/gles2_utils.target.linux-arm.mk b/gpu/command_buffer/gles2_utils.target.linux-arm.mk index b6cb592496..a23c9404ef 100644 --- a/gpu/command_buffer/gles2_utils.target.linux-arm.mk +++ b/gpu/command_buffer/gles2_utils.target.linux-arm.mk @@ -41,7 +41,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -73,12 +80,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -130,7 +142,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -162,12 +181,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer/gles2_utils.target.linux-arm64.mk b/gpu/command_buffer/gles2_utils.target.linux-arm64.mk index 6c2cbdba6a..2d44942367 100644 --- a/gpu/command_buffer/gles2_utils.target.linux-arm64.mk +++ b/gpu/command_buffer/gles2_utils.target.linux-arm64.mk @@ -70,12 +70,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -155,12 +160,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer/gles2_utils.target.linux-mips.mk b/gpu/command_buffer/gles2_utils.target.linux-mips.mk index e661a656ce..f9bfe3ef39 100644 --- a/gpu/command_buffer/gles2_utils.target.linux-mips.mk +++ b/gpu/command_buffer/gles2_utils.target.linux-mips.mk @@ -41,6 +41,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -73,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -130,6 +136,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -162,12 +169,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer/gles2_utils.target.linux-x86.mk b/gpu/command_buffer/gles2_utils.target.linux-x86.mk index 221e2e5879..17650a6582 100644 --- a/gpu/command_buffer/gles2_utils.target.linux-x86.mk +++ b/gpu/command_buffer/gles2_utils.target.linux-x86.mk @@ -40,6 +40,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -74,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -129,6 +135,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -163,12 +170,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer/gles2_utils.target.linux-x86_64.mk b/gpu/command_buffer/gles2_utils.target.linux-x86_64.mk index 1e21cbbc11..666c3a70f3 100644 --- a/gpu/command_buffer/gles2_utils.target.linux-x86_64.mk +++ b/gpu/command_buffer/gles2_utils.target.linux-x86_64.mk @@ -74,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -163,12 +168,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer/service/BUILD.gn b/gpu/command_buffer/service/BUILD.gn new file mode 100644 index 0000000000..f4e6199008 --- /dev/null +++ b/gpu/command_buffer/service/BUILD.gn @@ -0,0 +1,156 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ui.gni") +import("//third_party/protobuf/proto_library.gni") + +source_set("service") { + sources = [ + "async_pixel_transfer_delegate.cc", + "async_pixel_transfer_delegate.h", + "async_pixel_transfer_manager_android.cc", + "async_pixel_transfer_manager_idle.cc", + "async_pixel_transfer_manager_idle.h", + "async_pixel_transfer_manager_linux.cc", + "async_pixel_transfer_manager_mac.cc", + "async_pixel_transfer_manager_share_group.cc", + "async_pixel_transfer_manager_share_group.h", + "async_pixel_transfer_manager_stub.cc", + "async_pixel_transfer_manager_stub.h", + "async_pixel_transfer_manager_sync.cc", + "async_pixel_transfer_manager_sync.h", + "async_pixel_transfer_manager_win.cc", + "async_pixel_transfer_manager.cc", + "async_pixel_transfer_manager.h", + "buffer_manager.h", + "buffer_manager.cc", + "cmd_buffer_engine.h", + "cmd_parser.cc", + "cmd_parser.h", + "command_buffer_service.cc", + "command_buffer_service.h", + "common_decoder.cc", + "common_decoder.h", + "context_group.h", + "context_group.cc", + "context_state.h", + "context_state_autogen.h", + "context_state_impl_autogen.h", + "context_state.cc", + "error_state.cc", + "error_state.h", + "feature_info.h", + "feature_info.cc", + "framebuffer_manager.h", + "framebuffer_manager.cc", + "gles2_cmd_copy_texture_chromium.cc", + "gles2_cmd_copy_texture_chromium.h", + "gles2_cmd_decoder.h", + "gles2_cmd_decoder_autogen.h", + "gles2_cmd_decoder.cc", + "gles2_cmd_validation.h", + "gles2_cmd_validation.cc", + "gles2_cmd_validation_autogen.h", + "gles2_cmd_validation_implementation_autogen.h", + "gl_context_virtual.cc", + "gl_context_virtual.h", + "gl_state_restorer_impl.cc", + "gl_state_restorer_impl.h", + "gl_utils.h", + "gpu_control_service.cc", + "gpu_control_service.h", + "gpu_memory_buffer_manager.h", + "gpu_scheduler.cc", + "gpu_scheduler.h", + "gpu_scheduler_mock.h", + "gpu_state_tracer.cc", + "gpu_state_tracer.h", + "gpu_switches.cc", + "gpu_switches.h", + "gpu_tracer.cc", + "gpu_tracer.h", + "id_manager.h", + "id_manager.cc", + "image_manager.cc", + "image_manager.h", + "in_process_command_buffer.cc", + "in_process_command_buffer.h", + "logger.cc", + "logger.h", + "mailbox_manager.cc", + "mailbox_manager.h", + "mailbox_synchronizer.cc", + "mailbox_synchronizer.h", + "memory_program_cache.h", + "memory_program_cache.cc", + "mocks.h", + "program_manager.h", + "program_manager.cc", + "query_manager.h", + "query_manager.cc", + "renderbuffer_manager.h", + "renderbuffer_manager.cc", + "program_cache.h", + "program_cache.cc", + "shader_manager.h", + "shader_manager.cc", + "shader_translator.h", + "shader_translator.cc", + "shader_translator_cache.h", + "shader_translator_cache.cc", + "stream_texture_manager_in_process_android.h", + "stream_texture_manager_in_process_android.cc", + "texture_definition.h", + "texture_definition.cc", + "texture_manager.h", + "texture_manager.cc", + "transfer_buffer_manager.cc", + "transfer_buffer_manager.h", + "vertex_array_manager.h", + "vertex_array_manager.cc", + "vertex_attrib_manager.h", + "vertex_attrib_manager.cc", + ] + + configs += [ + "//third_party/khronos:khronos_headers", + ] + + deps = [ + ":disk_cache_proto", + "//base", + "//base/third_party/dynamic_annotations", + "//crypto", + "//gpu/command_buffer/common", + "//third_party/protobuf:protobuf_lite", + "//third_party/re2", + "//third_party/smhasher:cityhash", + "//ui/gfx", + "//ui/gfx/geometry", + "//ui/gl", + #TODO(GYP) + #'<(angle_path)/src/build_angle.gyp:translator', + ] + + if (ui_compositor_image_transport) { + include_dirs = [ "//third_party/khronos" ] + } + + if (is_win || is_android || (is_linux && use_x11)) { + sources += [ + "async_pixel_transfer_manager_egl.cc", + "async_pixel_transfer_manager_egl.h", + ] + } + + if (is_android && !is_debug) { + # On Android optimize more since this component can be a bottleneck. + configs -= [ "//build/config/compiler:optimize" ] + configs += [ "//build/config/compiler:optimize_max" ] + } +} + +proto_library("disk_cache_proto") { + sources = [ "disk_cache_proto.proto" ] +} diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc index 81df6b6060..cfbee736f6 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -777,6 +777,13 @@ void FeatureInfo::InitializeFeatures() { } } + if (extensions.Contains("GL_EXT_blend_minmax") || + gfx::HasDesktopGLFeatures()) { + AddExtensionString("GL_EXT_blend_minmax"); + validators_.equation.AddValue(GL_MIN_EXT); + validators_.equation.AddValue(GL_MAX_EXT); + } + if (extensions.Contains("GL_EXT_frag_depth") || gfx::HasDesktopGLFeatures()) { AddExtensionString("GL_EXT_frag_depth"); feature_flags_.ext_frag_depth = true; @@ -788,9 +795,16 @@ void FeatureInfo::InitializeFeatures() { feature_flags_.ext_shader_texture_lod = true; } + bool egl_khr_fence_sync = false; +#if !defined(OS_MACOSX) + if (workarounds_.disable_egl_khr_fence_sync) { + gfx::g_driver_egl.ext.b_EGL_KHR_fence_sync = false; + } + egl_khr_fence_sync = gfx::g_driver_egl.ext.b_EGL_KHR_fence_sync; +#endif bool ui_gl_fence_works = is_es3 || extensions.Contains("GL_NV_fence") || extensions.Contains("GL_ARB_sync") || - extensions.Contains("EGL_KHR_fence_sync"); + egl_khr_fence_sync; UMA_HISTOGRAM_BOOLEAN("GPU.FenceSupport", ui_gl_fence_works); feature_flags_.map_buffer_range = diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc index 973f2a0ee3..81ecfe29bf 100644 --- a/gpu/command_buffer/service/feature_info_unittest.cc +++ b/gpu/command_buffer/service/feature_info_unittest.cc @@ -316,6 +316,8 @@ TEST_F(FeatureInfoTest, InitializeNoExtensions) { GL_DEPTH_COMPONENT32_OES)); EXPECT_FALSE(info_->validators()->texture_internal_format_storage.IsValid( GL_DEPTH24_STENCIL8_OES)); + EXPECT_FALSE(info_->validators()->equation.IsValid(GL_MIN_EXT)); + EXPECT_FALSE(info_->validators()->equation.IsValid(GL_MAX_EXT)); } TEST_F(FeatureInfoTest, InitializeWithANGLE) { @@ -952,6 +954,13 @@ TEST_F(FeatureInfoTest, InitializeVAOsWithClientSideArrays) { EXPECT_FALSE(info_->feature_flags().native_vertex_array_object); } +TEST_F(FeatureInfoTest, InitializeEXT_blend_minmax) { + SetupInitExpectations("GL_EXT_blend_minmax"); + EXPECT_THAT(info_->extensions(), HasSubstr("GL_EXT_blend_minmax")); + EXPECT_TRUE(info_->validators()->equation.IsValid(GL_MIN_EXT)); + EXPECT_TRUE(info_->validators()->equation.IsValid(GL_MAX_EXT)); +} + TEST_F(FeatureInfoTest, InitializeEXT_frag_depth) { SetupInitExpectations("GL_EXT_frag_depth"); EXPECT_TRUE(info_->feature_flags().ext_frag_depth); diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 65fc86d249..793606f951 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -948,6 +948,8 @@ class GLES2DecoderImpl : public GLES2Decoder, void DoDrawBuffersEXT(GLsizei count, const GLenum* bufs); + void DoLoseContextCHROMIUM(GLenum current, GLenum other); + // Creates a Program for the given program. Program* CreateProgram( GLuint client_id, GLuint service_id) { @@ -1461,7 +1463,7 @@ class GLES2DecoderImpl : public GLES2Decoder, // simulated. bool SimulateAttrib0( const char* function_name, GLuint max_vertex_accessed, bool* simulated); - void RestoreStateForAttrib(GLuint attrib); + void RestoreStateForAttrib(GLuint attrib, bool restore_array_binding); // If an image is bound to texture, this will call Will/DidUseTexImage // if needed. @@ -1716,7 +1718,9 @@ class GLES2DecoderImpl : public GLES2Decoder, // Backbuffer attachments that are currently undefined. uint32 backbuffer_needs_clear_bits_; - // The current decoder error. + // The current decoder error communicates the decoder error through command + // processing functions that do not return the error value. Should be set only + // if not returning an error. error::Error current_decoder_error_; bool use_shader_translator_; @@ -4116,13 +4120,6 @@ void GLES2DecoderImpl::DoDisableVertexAttribArray(GLuint index) { void GLES2DecoderImpl::DoDiscardFramebufferEXT(GLenum target, GLsizei numAttachments, const GLenum* attachments) { - if (!features().ext_discard_framebuffer) { - LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, - "glDiscardFramebufferEXT", - "function not available"); - return; - } - Framebuffer* framebuffer = GetFramebufferInfoForTarget(GL_FRAMEBUFFER); @@ -5100,12 +5097,6 @@ void GLES2DecoderImpl::DoFramebufferTexture2D( void GLES2DecoderImpl::DoFramebufferTexture2DMultisample( GLenum target, GLenum attachment, GLenum textarget, GLuint client_texture_id, GLint level, GLsizei samples) { - if (!features().multisampled_render_to_texture) { - LOCAL_SET_GL_ERROR( - GL_INVALID_OPERATION, - "glFramebufferTexture2DMultisample", "function not available"); - return; - } DoFramebufferTexture2DCommon( "glFramebufferTexture2DMultisample", target, attachment, textarget, client_texture_id, level, samples); @@ -5238,12 +5229,6 @@ void GLES2DecoderImpl::DoBlitFramebufferCHROMIUM( GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) { DCHECK(!ShouldDeferReads() && !ShouldDeferDraws()); - if (!features().chromium_framebuffer_multisample) { - LOCAL_SET_GL_ERROR( - GL_INVALID_OPERATION, - "glBlitFramebufferCHROMIUM", "function not available"); - return; - } if (!CheckBoundFramebuffersValid("glBlitFramebufferCHROMIUM")) { return; @@ -5343,13 +5328,6 @@ bool GLES2DecoderImpl::ValidateRenderbufferStorageMultisample( void GLES2DecoderImpl::DoRenderbufferStorageMultisampleCHROMIUM( GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height) { - if (!features().chromium_framebuffer_multisample) { - LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, - "glRenderbufferStorageMultisampleCHROMIUM", - "function not available"); - return; - } - Renderbuffer* renderbuffer = GetRenderbufferInfoForTarget(GL_RENDERBUFFER); if (!renderbuffer) { LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, @@ -5396,13 +5374,6 @@ void GLES2DecoderImpl::DoRenderbufferStorageMultisampleCHROMIUM( void GLES2DecoderImpl::DoRenderbufferStorageMultisampleEXT( GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height) { - if (!features().multisampled_render_to_texture) { - LOCAL_SET_GL_ERROR( - GL_INVALID_OPERATION, - "glRenderbufferStorageMultisampleEXT", "function not available"); - return; - } - Renderbuffer* renderbuffer = GetRenderbufferInfoForTarget(GL_RENDERBUFFER); if (!renderbuffer) { LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, @@ -6267,21 +6238,23 @@ bool GLES2DecoderImpl::SimulateAttrib0( return true; } -void GLES2DecoderImpl::RestoreStateForAttrib(GLuint attrib_index) { +void GLES2DecoderImpl::RestoreStateForAttrib( + GLuint attrib_index, bool restore_array_binding) { const VertexAttrib* attrib = state_.vertex_attrib_manager->GetVertexAttrib(attrib_index); - const void* ptr = reinterpret_cast<const void*>(attrib->offset()); - Buffer* buffer = attrib->buffer(); - glBindBuffer(GL_ARRAY_BUFFER, buffer ? buffer->service_id() : 0); - glVertexAttribPointer( - attrib_index, attrib->size(), attrib->type(), attrib->normalized(), - attrib->gl_stride(), ptr); + if (restore_array_binding) { + const void* ptr = reinterpret_cast<const void*>(attrib->offset()); + Buffer* buffer = attrib->buffer(); + glBindBuffer(GL_ARRAY_BUFFER, buffer ? buffer->service_id() : 0); + glVertexAttribPointer( + attrib_index, attrib->size(), attrib->type(), attrib->normalized(), + attrib->gl_stride(), ptr); + } if (attrib->divisor()) glVertexAttribDivisorANGLE(attrib_index, attrib->divisor()); glBindBuffer( - GL_ARRAY_BUFFER, - state_.bound_array_buffer.get() ? state_.bound_array_buffer->service_id() - : 0); + GL_ARRAY_BUFFER, state_.bound_array_buffer.get() ? + state_.bound_array_buffer->service_id() : 0); // Never touch vertex attribute 0's state (in particular, never // disable it) when running on desktop GL because it will never be @@ -6485,7 +6458,11 @@ error::Error GLES2DecoderImpl::DoDrawArrays( } } if (simulated_attrib_0) { - RestoreStateForAttrib(0); + // We don't have to restore attrib 0 generic data at the end of this + // function even if it is simulated. This is because we will simulate + // it in each draw call, and attrib 0 generic data queries use cached + // values instead of passing down to the underlying driver. + RestoreStateForAttrib(0, false); } } return error::kNoError; @@ -6621,7 +6598,11 @@ error::Error GLES2DecoderImpl::DoDrawElements( } } if (simulated_attrib_0) { - RestoreStateForAttrib(0); + // We don't have to restore attrib 0 generic data at the end of this + // function even if it is simulated. This is because we will simulate + // it in each draw call, and attrib 0 generic data queries use cached + // values instead of passing down to the underlying driver. + RestoreStateForAttrib(0, false); } } return error::kNoError; @@ -7197,6 +7178,7 @@ error::Error GLES2DecoderImpl::HandleVertexAttribDivisorANGLE( LOCAL_SET_GL_ERROR( GL_INVALID_OPERATION, "glVertexAttribDivisorANGLE", "function not available"); + return error::kNoError; } GLuint index = c.index; GLuint divisor = c.divisor; @@ -8287,7 +8269,8 @@ error::Error GLES2DecoderImpl::HandleCompressedTexSubImage2DBucket( error::Error GLES2DecoderImpl::HandleTexImage2D( uint32 immediate_data_size, const cmds::TexImage2D& c) { - TRACE_EVENT0("gpu", "GLES2DecoderImpl::HandleTexImage2D"); + TRACE_EVENT2("gpu", "GLES2DecoderImpl::HandleTexImage2D", + "width", c.width, "height", c.height); // Set as failed for now, but if it successed, this will be set to not failed. texture_state_.tex_image_2d_failed = true; GLenum target = static_cast<GLenum>(c.target); @@ -8421,6 +8404,7 @@ void GLES2DecoderImpl::DoCopyTexImage2D( if (texture->IsImmutable()) { LOCAL_SET_GL_ERROR( GL_INVALID_OPERATION, "glCopyTexImage2D", "texture is immutable"); + return; } if (!texture_manager()->ValidForTarget(target, level, width, height, 1) || border != 0) { @@ -8761,7 +8745,8 @@ error::Error GLES2DecoderImpl::DoTexSubImage2D( error::Error GLES2DecoderImpl::HandleTexSubImage2D( uint32 immediate_data_size, const cmds::TexSubImage2D& c) { - TRACE_EVENT0("gpu", "GLES2DecoderImpl::HandleTexSubImage2D"); + TRACE_EVENT2("gpu", "GLES2DecoderImpl::HandleTexSubImage2D", + "width", c.width, "height", c.height); GLboolean internal = static_cast<GLboolean>(c.internal); if (internal == GL_TRUE && texture_state_.tex_image_2d_failed) return error::kNoError; @@ -9095,7 +9080,7 @@ error::Error GLES2DecoderImpl::HandleShaderBinary( if (shaders == NULL || binary == NULL) { return error::kOutOfBounds; } - scoped_array<GLuint> service_ids(new GLuint[n]); + scoped_ptr<GLuint[]> service_ids(new GLuint[n]); for (GLsizei ii = 0; ii < n; ++ii) { Shader* shader = GetShader(shaders[ii]); if (!shader) { @@ -9473,23 +9458,6 @@ void GLES2DecoderImpl::LoseContext(uint32 reset_status) { current_decoder_error_ = error::kLostContext; } -error::Error GLES2DecoderImpl::HandleLoseContextCHROMIUM( - uint32 immediate_data_size, const cmds::LoseContextCHROMIUM& c) { - GLenum current = static_cast<GLenum>(c.current); - GLenum other = static_cast<GLenum>(c.other); - if (!validators_->reset_status.IsValid(current)) { - LOCAL_SET_GL_ERROR_INVALID_ENUM( - "glLoseContextCHROMIUM", current, "current"); - } - if (!validators_->reset_status.IsValid(other)) { - LOCAL_SET_GL_ERROR_INVALID_ENUM("glLoseContextCHROMIUM", other, "other"); - } - group_->LoseContexts(other); - reset_status_ = current; - current_decoder_error_ = error::kLostContext; - return error::kLostContext; -} - error::Error GLES2DecoderImpl::HandleInsertSyncPointCHROMIUM( uint32 immediate_data_size, const cmds::InsertSyncPointCHROMIUM& c) { return error::kUnknownCommand; @@ -9758,7 +9726,7 @@ void GLES2DecoderImpl::DoBindVertexArrayOES(GLuint client_id) { void GLES2DecoderImpl::EmulateVertexArrayState() { // Setup the Vertex attribute state for (uint32 vv = 0; vv < group_->max_vertex_attribs(); ++vv) { - RestoreStateForAttrib(vv); + RestoreStateForAttrib(vv, true); } // Setup the element buffer @@ -10133,7 +10101,8 @@ void GLES2DecoderImpl::DoTexStorage2DEXT( GLenum internal_format, GLsizei width, GLsizei height) { - TRACE_EVENT0("gpu", "GLES2DecoderImpl::DoTexStorage2DEXT"); + TRACE_EVENT2("gpu", "GLES2DecoderImpl::DoTexStorage2DEXT", + "width", width, "height", height); if (!texture_manager()->ValidForTarget(target, 0, width, height, 1) || TextureManager::ComputeMipMapCount(target, width, height, 1) < levels) { LOCAL_SET_GL_ERROR( @@ -10486,6 +10455,12 @@ void GLES2DecoderImpl::DoDrawBuffersEXT( } } +void GLES2DecoderImpl::DoLoseContextCHROMIUM(GLenum current, GLenum other) { + group_->LoseContexts(other); + reset_status_ = current; + current_decoder_error_ = error::kLostContext; +} + bool GLES2DecoderImpl::ValidateAsyncTransfer( const char* function_name, TextureRef* texture_ref, diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h index 6220afcbc0..edf5a57141 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h @@ -401,11 +401,6 @@ error::Error GLES2DecoderImpl::HandleCopyTexImage2D( LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCopyTexImage2D", "height < 0"); return error::kNoError; } - if (!validators_->texture_border.IsValid(border)) { - LOCAL_SET_GL_ERROR( - GL_INVALID_VALUE, "glCopyTexImage2D", "border GL_INVALID_VALUE"); - return error::kNoError; - } DoCopyTexImage2D(target, level, internalformat, x, y, width, height, border); return error::kNoError; } @@ -480,23 +475,6 @@ error::Error GLES2DecoderImpl::HandleCullFace(uint32_t immediate_data_size, return error::kNoError; } -error::Error GLES2DecoderImpl::HandleDeleteBuffers( - uint32_t immediate_data_size, - const gles2::cmds::DeleteBuffers& c) { - GLsizei n = static_cast<GLsizei>(c.n); - uint32_t data_size; - if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { - return error::kOutOfBounds; - } - const GLuint* buffers = GetSharedMemoryAs<const GLuint*>( - c.buffers_shm_id, c.buffers_shm_offset, data_size); - if (buffers == NULL) { - return error::kOutOfBounds; - } - DeleteBuffersHelper(n, buffers); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleDeleteBuffersImmediate( uint32_t immediate_data_size, const gles2::cmds::DeleteBuffersImmediate& c) { @@ -514,23 +492,6 @@ error::Error GLES2DecoderImpl::HandleDeleteBuffersImmediate( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleDeleteFramebuffers( - uint32_t immediate_data_size, - const gles2::cmds::DeleteFramebuffers& c) { - GLsizei n = static_cast<GLsizei>(c.n); - uint32_t data_size; - if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { - return error::kOutOfBounds; - } - const GLuint* framebuffers = GetSharedMemoryAs<const GLuint*>( - c.framebuffers_shm_id, c.framebuffers_shm_offset, data_size); - if (framebuffers == NULL) { - return error::kOutOfBounds; - } - DeleteFramebuffersHelper(n, framebuffers); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleDeleteFramebuffersImmediate( uint32_t immediate_data_size, const gles2::cmds::DeleteFramebuffersImmediate& c) { @@ -548,23 +509,6 @@ error::Error GLES2DecoderImpl::HandleDeleteFramebuffersImmediate( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleDeleteRenderbuffers( - uint32_t immediate_data_size, - const gles2::cmds::DeleteRenderbuffers& c) { - GLsizei n = static_cast<GLsizei>(c.n); - uint32_t data_size; - if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { - return error::kOutOfBounds; - } - const GLuint* renderbuffers = GetSharedMemoryAs<const GLuint*>( - c.renderbuffers_shm_id, c.renderbuffers_shm_offset, data_size); - if (renderbuffers == NULL) { - return error::kOutOfBounds; - } - DeleteRenderbuffersHelper(n, renderbuffers); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleDeleteRenderbuffersImmediate( uint32_t immediate_data_size, const gles2::cmds::DeleteRenderbuffersImmediate& c) { @@ -582,23 +526,6 @@ error::Error GLES2DecoderImpl::HandleDeleteRenderbuffersImmediate( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleDeleteTextures( - uint32_t immediate_data_size, - const gles2::cmds::DeleteTextures& c) { - GLsizei n = static_cast<GLsizei>(c.n); - uint32_t data_size; - if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { - return error::kOutOfBounds; - } - const GLuint* textures = GetSharedMemoryAs<const GLuint*>( - c.textures_shm_id, c.textures_shm_offset, data_size); - if (textures == NULL) { - return error::kOutOfBounds; - } - DeleteTexturesHelper(n, textures); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleDeleteTexturesImmediate( uint32_t immediate_data_size, const gles2::cmds::DeleteTexturesImmediate& c) { @@ -763,11 +690,6 @@ error::Error GLES2DecoderImpl::HandleFramebufferTexture2D( "glFramebufferTexture2D", textarget, "textarget"); return error::kNoError; } - if (!validators_->zero_only.IsValid(level)) { - LOCAL_SET_GL_ERROR( - GL_INVALID_VALUE, "glFramebufferTexture2D", "level GL_INVALID_VALUE"); - return error::kNoError; - } DoFramebufferTexture2D(target, attachment, textarget, texture, level); return error::kNoError; } @@ -787,25 +709,6 @@ error::Error GLES2DecoderImpl::HandleFrontFace( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleGenBuffers( - uint32_t immediate_data_size, - const gles2::cmds::GenBuffers& c) { - GLsizei n = static_cast<GLsizei>(c.n); - uint32_t data_size; - if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { - return error::kOutOfBounds; - } - GLuint* buffers = GetSharedMemoryAs<GLuint*>( - c.buffers_shm_id, c.buffers_shm_offset, data_size); - if (buffers == NULL) { - return error::kOutOfBounds; - } - if (!GenBuffersHelper(n, buffers)) { - return error::kInvalidArguments; - } - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleGenBuffersImmediate( uint32_t immediate_data_size, const gles2::cmds::GenBuffersImmediate& c) { @@ -837,25 +740,6 @@ error::Error GLES2DecoderImpl::HandleGenerateMipmap( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleGenFramebuffers( - uint32_t immediate_data_size, - const gles2::cmds::GenFramebuffers& c) { - GLsizei n = static_cast<GLsizei>(c.n); - uint32_t data_size; - if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { - return error::kOutOfBounds; - } - GLuint* framebuffers = GetSharedMemoryAs<GLuint*>( - c.framebuffers_shm_id, c.framebuffers_shm_offset, data_size); - if (framebuffers == NULL) { - return error::kOutOfBounds; - } - if (!GenFramebuffersHelper(n, framebuffers)) { - return error::kInvalidArguments; - } - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleGenFramebuffersImmediate( uint32_t immediate_data_size, const gles2::cmds::GenFramebuffersImmediate& c) { @@ -875,25 +759,6 @@ error::Error GLES2DecoderImpl::HandleGenFramebuffersImmediate( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleGenRenderbuffers( - uint32_t immediate_data_size, - const gles2::cmds::GenRenderbuffers& c) { - GLsizei n = static_cast<GLsizei>(c.n); - uint32_t data_size; - if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { - return error::kOutOfBounds; - } - GLuint* renderbuffers = GetSharedMemoryAs<GLuint*>( - c.renderbuffers_shm_id, c.renderbuffers_shm_offset, data_size); - if (renderbuffers == NULL) { - return error::kOutOfBounds; - } - if (!GenRenderbuffersHelper(n, renderbuffers)) { - return error::kInvalidArguments; - } - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleGenRenderbuffersImmediate( uint32_t immediate_data_size, const gles2::cmds::GenRenderbuffersImmediate& c) { @@ -913,25 +778,6 @@ error::Error GLES2DecoderImpl::HandleGenRenderbuffersImmediate( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleGenTextures( - uint32_t immediate_data_size, - const gles2::cmds::GenTextures& c) { - GLsizei n = static_cast<GLsizei>(c.n); - uint32_t data_size; - if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { - return error::kOutOfBounds; - } - GLuint* textures = GetSharedMemoryAs<GLuint*>( - c.textures_shm_id, c.textures_shm_offset, data_size); - if (textures == NULL) { - return error::kOutOfBounds; - } - if (!GenTexturesHelper(n, textures)) { - return error::kInvalidArguments; - } - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleGenTexturesImmediate( uint32_t immediate_data_size, const gles2::cmds::GenTexturesImmediate& c) { @@ -1826,32 +1672,6 @@ error::Error GLES2DecoderImpl::HandleTexParameterf( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleTexParameterfv( - 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_t data_size; - if (!ComputeDataSize(1, sizeof(GLfloat), 1, &data_size)) { - return error::kOutOfBounds; - } - const GLfloat* params = GetSharedMemoryAs<const GLfloat*>( - c.params_shm_id, c.params_shm_offset, data_size); - if (!validators_->texture_bind_target.IsValid(target)) { - LOCAL_SET_GL_ERROR_INVALID_ENUM("glTexParameterfv", target, "target"); - return error::kNoError; - } - if (!validators_->texture_parameter.IsValid(pname)) { - LOCAL_SET_GL_ERROR_INVALID_ENUM("glTexParameterfv", pname, "pname"); - return error::kNoError; - } - if (params == NULL) { - return error::kOutOfBounds; - } - DoTexParameterfv(target, pname, params); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleTexParameterfvImmediate( uint32_t immediate_data_size, const gles2::cmds::TexParameterfvImmediate& c) { @@ -1899,32 +1719,6 @@ error::Error GLES2DecoderImpl::HandleTexParameteri( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleTexParameteriv( - 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_t data_size; - if (!ComputeDataSize(1, sizeof(GLint), 1, &data_size)) { - return error::kOutOfBounds; - } - const GLint* params = GetSharedMemoryAs<const GLint*>( - c.params_shm_id, c.params_shm_offset, data_size); - if (!validators_->texture_bind_target.IsValid(target)) { - LOCAL_SET_GL_ERROR_INVALID_ENUM("glTexParameteriv", target, "target"); - return error::kNoError; - } - if (!validators_->texture_parameter.IsValid(pname)) { - LOCAL_SET_GL_ERROR_INVALID_ENUM("glTexParameteriv", pname, "pname"); - return error::kNoError; - } - if (params == NULL) { - return error::kOutOfBounds; - } - DoTexParameteriv(target, pname, params); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleTexParameterivImmediate( uint32_t immediate_data_size, const gles2::cmds::TexParameterivImmediate& c) { @@ -1966,24 +1760,6 @@ error::Error GLES2DecoderImpl::HandleUniform1f( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleUniform1fv( - 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_t data_size; - if (!ComputeDataSize(count, sizeof(GLfloat), 1, &data_size)) { - return error::kOutOfBounds; - } - const GLfloat* v = - GetSharedMemoryAs<const GLfloat*>(c.v_shm_id, c.v_shm_offset, data_size); - if (v == NULL) { - return error::kOutOfBounds; - } - DoUniform1fv(location, count, v); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleUniform1fvImmediate( uint32_t immediate_data_size, const gles2::cmds::Uniform1fvImmediate& c) { @@ -2014,24 +1790,6 @@ error::Error GLES2DecoderImpl::HandleUniform1i( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleUniform1iv( - 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_t data_size; - if (!ComputeDataSize(count, sizeof(GLint), 1, &data_size)) { - return error::kOutOfBounds; - } - const GLint* v = - GetSharedMemoryAs<const GLint*>(c.v_shm_id, c.v_shm_offset, data_size); - if (v == NULL) { - return error::kOutOfBounds; - } - DoUniform1iv(location, count, v); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleUniform1ivImmediate( uint32_t immediate_data_size, const gles2::cmds::Uniform1ivImmediate& c) { @@ -2066,24 +1824,6 @@ error::Error GLES2DecoderImpl::HandleUniform2f( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleUniform2fv( - 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_t data_size; - if (!ComputeDataSize(count, sizeof(GLfloat), 2, &data_size)) { - return error::kOutOfBounds; - } - const GLfloat* v = - GetSharedMemoryAs<const GLfloat*>(c.v_shm_id, c.v_shm_offset, data_size); - if (v == NULL) { - return error::kOutOfBounds; - } - DoUniform2fv(location, count, v); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleUniform2fvImmediate( uint32_t immediate_data_size, const gles2::cmds::Uniform2fvImmediate& c) { @@ -2118,24 +1858,6 @@ error::Error GLES2DecoderImpl::HandleUniform2i( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleUniform2iv( - 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_t data_size; - if (!ComputeDataSize(count, sizeof(GLint), 2, &data_size)) { - return error::kOutOfBounds; - } - const GLint* v = - GetSharedMemoryAs<const GLint*>(c.v_shm_id, c.v_shm_offset, data_size); - if (v == NULL) { - return error::kOutOfBounds; - } - DoUniform2iv(location, count, v); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleUniform2ivImmediate( uint32_t immediate_data_size, const gles2::cmds::Uniform2ivImmediate& c) { @@ -2171,24 +1893,6 @@ error::Error GLES2DecoderImpl::HandleUniform3f( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleUniform3fv( - 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_t data_size; - if (!ComputeDataSize(count, sizeof(GLfloat), 3, &data_size)) { - return error::kOutOfBounds; - } - const GLfloat* v = - GetSharedMemoryAs<const GLfloat*>(c.v_shm_id, c.v_shm_offset, data_size); - if (v == NULL) { - return error::kOutOfBounds; - } - DoUniform3fv(location, count, v); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleUniform3fvImmediate( uint32_t immediate_data_size, const gles2::cmds::Uniform3fvImmediate& c) { @@ -2224,24 +1928,6 @@ error::Error GLES2DecoderImpl::HandleUniform3i( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleUniform3iv( - 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_t data_size; - if (!ComputeDataSize(count, sizeof(GLint), 3, &data_size)) { - return error::kOutOfBounds; - } - const GLint* v = - GetSharedMemoryAs<const GLint*>(c.v_shm_id, c.v_shm_offset, data_size); - if (v == NULL) { - return error::kOutOfBounds; - } - DoUniform3iv(location, count, v); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleUniform3ivImmediate( uint32_t immediate_data_size, const gles2::cmds::Uniform3ivImmediate& c) { @@ -2278,24 +1964,6 @@ error::Error GLES2DecoderImpl::HandleUniform4f( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleUniform4fv( - 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_t data_size; - if (!ComputeDataSize(count, sizeof(GLfloat), 4, &data_size)) { - return error::kOutOfBounds; - } - const GLfloat* v = - GetSharedMemoryAs<const GLfloat*>(c.v_shm_id, c.v_shm_offset, data_size); - if (v == NULL) { - return error::kOutOfBounds; - } - DoUniform4fv(location, count, v); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleUniform4fvImmediate( uint32_t immediate_data_size, const gles2::cmds::Uniform4fvImmediate& c) { @@ -2332,24 +2000,6 @@ error::Error GLES2DecoderImpl::HandleUniform4i( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleUniform4iv( - 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_t data_size; - if (!ComputeDataSize(count, sizeof(GLint), 4, &data_size)) { - return error::kOutOfBounds; - } - const GLint* v = - GetSharedMemoryAs<const GLint*>(c.v_shm_id, c.v_shm_offset, data_size); - if (v == NULL) { - return error::kOutOfBounds; - } - DoUniform4iv(location, count, v); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleUniform4ivImmediate( uint32_t immediate_data_size, const gles2::cmds::Uniform4ivImmediate& c) { @@ -2371,30 +2021,6 @@ error::Error GLES2DecoderImpl::HandleUniform4ivImmediate( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleUniformMatrix2fv( - 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_t data_size; - if (!ComputeDataSize(count, sizeof(GLfloat), 4, &data_size)) { - return error::kOutOfBounds; - } - const GLfloat* value = GetSharedMemoryAs<const GLfloat*>( - c.value_shm_id, c.value_shm_offset, data_size); - if (!validators_->false_only.IsValid(transpose)) { - LOCAL_SET_GL_ERROR( - GL_INVALID_VALUE, "glUniformMatrix2fv", "transpose GL_INVALID_VALUE"); - return error::kNoError; - } - if (value == NULL) { - return error::kOutOfBounds; - } - DoUniformMatrix2fv(location, count, transpose, value); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleUniformMatrix2fvImmediate( uint32_t immediate_data_size, const gles2::cmds::UniformMatrix2fvImmediate& c) { @@ -2410,11 +2036,6 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix2fvImmediate( } const GLfloat* value = GetImmediateDataAs<const GLfloat*>(c, data_size, immediate_data_size); - if (!validators_->false_only.IsValid(transpose)) { - LOCAL_SET_GL_ERROR( - GL_INVALID_VALUE, "glUniformMatrix2fv", "transpose GL_INVALID_VALUE"); - return error::kNoError; - } if (value == NULL) { return error::kOutOfBounds; } @@ -2422,30 +2043,6 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix2fvImmediate( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleUniformMatrix3fv( - 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_t data_size; - if (!ComputeDataSize(count, sizeof(GLfloat), 9, &data_size)) { - return error::kOutOfBounds; - } - const GLfloat* value = GetSharedMemoryAs<const GLfloat*>( - c.value_shm_id, c.value_shm_offset, data_size); - if (!validators_->false_only.IsValid(transpose)) { - LOCAL_SET_GL_ERROR( - GL_INVALID_VALUE, "glUniformMatrix3fv", "transpose GL_INVALID_VALUE"); - return error::kNoError; - } - if (value == NULL) { - return error::kOutOfBounds; - } - DoUniformMatrix3fv(location, count, transpose, value); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleUniformMatrix3fvImmediate( uint32_t immediate_data_size, const gles2::cmds::UniformMatrix3fvImmediate& c) { @@ -2461,11 +2058,6 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix3fvImmediate( } const GLfloat* value = GetImmediateDataAs<const GLfloat*>(c, data_size, immediate_data_size); - if (!validators_->false_only.IsValid(transpose)) { - LOCAL_SET_GL_ERROR( - GL_INVALID_VALUE, "glUniformMatrix3fv", "transpose GL_INVALID_VALUE"); - return error::kNoError; - } if (value == NULL) { return error::kOutOfBounds; } @@ -2473,30 +2065,6 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix3fvImmediate( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleUniformMatrix4fv( - 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_t data_size; - if (!ComputeDataSize(count, sizeof(GLfloat), 16, &data_size)) { - return error::kOutOfBounds; - } - const GLfloat* value = GetSharedMemoryAs<const GLfloat*>( - c.value_shm_id, c.value_shm_offset, data_size); - if (!validators_->false_only.IsValid(transpose)) { - LOCAL_SET_GL_ERROR( - GL_INVALID_VALUE, "glUniformMatrix4fv", "transpose GL_INVALID_VALUE"); - return error::kNoError; - } - if (value == NULL) { - return error::kOutOfBounds; - } - DoUniformMatrix4fv(location, count, transpose, value); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleUniformMatrix4fvImmediate( uint32_t immediate_data_size, const gles2::cmds::UniformMatrix4fvImmediate& c) { @@ -2512,11 +2080,6 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix4fvImmediate( } const GLfloat* value = GetImmediateDataAs<const GLfloat*>(c, data_size, immediate_data_size); - if (!validators_->false_only.IsValid(transpose)) { - LOCAL_SET_GL_ERROR( - GL_INVALID_VALUE, "glUniformMatrix4fv", "transpose GL_INVALID_VALUE"); - return error::kNoError; - } if (value == NULL) { return error::kOutOfBounds; } @@ -2549,23 +2112,6 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib1f( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleVertexAttrib1fv( - uint32_t immediate_data_size, - const gles2::cmds::VertexAttrib1fv& c) { - GLuint indx = static_cast<GLuint>(c.indx); - uint32_t data_size; - if (!ComputeDataSize(1, sizeof(GLfloat), 1, &data_size)) { - return error::kOutOfBounds; - } - const GLfloat* values = GetSharedMemoryAs<const GLfloat*>( - c.values_shm_id, c.values_shm_offset, data_size); - if (values == NULL) { - return error::kOutOfBounds; - } - DoVertexAttrib1fv(indx, values); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleVertexAttrib1fvImmediate( uint32_t immediate_data_size, const gles2::cmds::VertexAttrib1fvImmediate& c) { @@ -2596,23 +2142,6 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib2f( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleVertexAttrib2fv( - uint32_t immediate_data_size, - const gles2::cmds::VertexAttrib2fv& c) { - GLuint indx = static_cast<GLuint>(c.indx); - uint32_t data_size; - if (!ComputeDataSize(1, sizeof(GLfloat), 2, &data_size)) { - return error::kOutOfBounds; - } - const GLfloat* values = GetSharedMemoryAs<const GLfloat*>( - c.values_shm_id, c.values_shm_offset, data_size); - if (values == NULL) { - return error::kOutOfBounds; - } - DoVertexAttrib2fv(indx, values); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleVertexAttrib2fvImmediate( uint32_t immediate_data_size, const gles2::cmds::VertexAttrib2fvImmediate& c) { @@ -2644,23 +2173,6 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib3f( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleVertexAttrib3fv( - uint32_t immediate_data_size, - const gles2::cmds::VertexAttrib3fv& c) { - GLuint indx = static_cast<GLuint>(c.indx); - uint32_t data_size; - if (!ComputeDataSize(1, sizeof(GLfloat), 3, &data_size)) { - return error::kOutOfBounds; - } - const GLfloat* values = GetSharedMemoryAs<const GLfloat*>( - c.values_shm_id, c.values_shm_offset, data_size); - if (values == NULL) { - return error::kOutOfBounds; - } - DoVertexAttrib3fv(indx, values); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleVertexAttrib3fvImmediate( uint32_t immediate_data_size, const gles2::cmds::VertexAttrib3fvImmediate& c) { @@ -2693,23 +2205,6 @@ error::Error GLES2DecoderImpl::HandleVertexAttrib4f( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleVertexAttrib4fv( - uint32_t immediate_data_size, - const gles2::cmds::VertexAttrib4fv& c) { - GLuint indx = static_cast<GLuint>(c.indx); - uint32_t data_size; - if (!ComputeDataSize(1, sizeof(GLfloat), 4, &data_size)) { - return error::kOutOfBounds; - } - const GLfloat* values = GetSharedMemoryAs<const GLfloat*>( - c.values_shm_id, c.values_shm_offset, data_size); - if (values == NULL) { - return error::kOutOfBounds; - } - DoVertexAttrib4fv(indx, values); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleVertexAttrib4fvImmediate( uint32_t immediate_data_size, const gles2::cmds::VertexAttrib4fvImmediate& c) { @@ -2751,6 +2246,13 @@ error::Error GLES2DecoderImpl::HandleViewport(uint32_t immediate_data_size, error::Error GLES2DecoderImpl::HandleBlitFramebufferCHROMIUM( uint32_t immediate_data_size, const gles2::cmds::BlitFramebufferCHROMIUM& c) { + if (!features().chromium_framebuffer_multisample) { + LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, + "glBlitFramebufferCHROMIUM", + "function not available"); + return error::kNoError; + } + error::Error error; error = WillAccessBoundFramebufferForDraw(); if (error != error::kNoError) @@ -2781,6 +2283,13 @@ error::Error GLES2DecoderImpl::HandleBlitFramebufferCHROMIUM( error::Error GLES2DecoderImpl::HandleRenderbufferStorageMultisampleCHROMIUM( uint32_t immediate_data_size, const gles2::cmds::RenderbufferStorageMultisampleCHROMIUM& c) { + if (!features().chromium_framebuffer_multisample) { + LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, + "glRenderbufferStorageMultisampleCHROMIUM", + "function not available"); + return error::kNoError; + } + GLenum target = static_cast<GLenum>(c.target); GLsizei samples = static_cast<GLsizei>(c.samples); GLenum internalformat = static_cast<GLenum>(c.internalformat); @@ -2823,6 +2332,13 @@ error::Error GLES2DecoderImpl::HandleRenderbufferStorageMultisampleCHROMIUM( error::Error GLES2DecoderImpl::HandleRenderbufferStorageMultisampleEXT( uint32_t immediate_data_size, const gles2::cmds::RenderbufferStorageMultisampleEXT& c) { + if (!features().multisampled_render_to_texture) { + LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, + "glRenderbufferStorageMultisampleEXT", + "function not available"); + return error::kNoError; + } + GLenum target = static_cast<GLenum>(c.target); GLsizei samples = static_cast<GLsizei>(c.samples); GLenum internalformat = static_cast<GLenum>(c.internalformat); @@ -2862,6 +2378,13 @@ error::Error GLES2DecoderImpl::HandleRenderbufferStorageMultisampleEXT( error::Error GLES2DecoderImpl::HandleFramebufferTexture2DMultisampleEXT( uint32_t immediate_data_size, const gles2::cmds::FramebufferTexture2DMultisampleEXT& c) { + if (!features().multisampled_render_to_texture) { + LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, + "glFramebufferTexture2DMultisampleEXT", + "function not available"); + return error::kNoError; + } + GLenum target = static_cast<GLenum>(c.target); GLenum attachment = static_cast<GLenum>(c.attachment); GLenum textarget = static_cast<GLenum>(c.textarget); @@ -2883,12 +2406,6 @@ error::Error GLES2DecoderImpl::HandleFramebufferTexture2DMultisampleEXT( "glFramebufferTexture2DMultisampleEXT", textarget, "textarget"); return error::kNoError; } - if (!validators_->zero_only.IsValid(level)) { - LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, - "glFramebufferTexture2DMultisampleEXT", - "level GL_INVALID_VALUE"); - return error::kNoError; - } if (samples < 0) { LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glFramebufferTexture2DMultisampleEXT", @@ -2933,25 +2450,6 @@ error::Error GLES2DecoderImpl::HandleTexStorage2DEXT( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleGenQueriesEXT( - uint32_t immediate_data_size, - const gles2::cmds::GenQueriesEXT& c) { - GLsizei n = static_cast<GLsizei>(c.n); - uint32_t data_size; - if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { - return error::kOutOfBounds; - } - GLuint* queries = GetSharedMemoryAs<GLuint*>( - c.queries_shm_id, c.queries_shm_offset, data_size); - if (queries == NULL) { - return error::kOutOfBounds; - } - if (!GenQueriesEXTHelper(n, queries)) { - return error::kInvalidArguments; - } - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleGenQueriesEXTImmediate( uint32_t immediate_data_size, const gles2::cmds::GenQueriesEXTImmediate& c) { @@ -2971,23 +2469,6 @@ error::Error GLES2DecoderImpl::HandleGenQueriesEXTImmediate( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleDeleteQueriesEXT( - uint32_t immediate_data_size, - const gles2::cmds::DeleteQueriesEXT& c) { - GLsizei n = static_cast<GLsizei>(c.n); - uint32_t data_size; - if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { - return error::kOutOfBounds; - } - const GLuint* queries = GetSharedMemoryAs<const GLuint*>( - c.queries_shm_id, c.queries_shm_offset, data_size); - if (queries == NULL) { - return error::kOutOfBounds; - } - DeleteQueriesEXTHelper(n, queries); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleDeleteQueriesEXTImmediate( uint32_t immediate_data_size, const gles2::cmds::DeleteQueriesEXTImmediate& c) { @@ -3044,25 +2525,6 @@ error::Error GLES2DecoderImpl::HandlePopGroupMarkerEXT( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleGenVertexArraysOES( - uint32_t immediate_data_size, - const gles2::cmds::GenVertexArraysOES& c) { - GLsizei n = static_cast<GLsizei>(c.n); - uint32_t data_size; - if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { - return error::kOutOfBounds; - } - GLuint* arrays = GetSharedMemoryAs<GLuint*>( - c.arrays_shm_id, c.arrays_shm_offset, data_size); - if (arrays == NULL) { - return error::kOutOfBounds; - } - if (!GenVertexArraysOESHelper(n, arrays)) { - return error::kInvalidArguments; - } - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleGenVertexArraysOESImmediate( uint32_t immediate_data_size, const gles2::cmds::GenVertexArraysOESImmediate& c) { @@ -3082,23 +2544,6 @@ error::Error GLES2DecoderImpl::HandleGenVertexArraysOESImmediate( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleDeleteVertexArraysOES( - uint32_t immediate_data_size, - const gles2::cmds::DeleteVertexArraysOES& c) { - GLsizei n = static_cast<GLsizei>(c.n); - uint32_t data_size; - if (!SafeMultiplyUint32(n, sizeof(GLuint), &data_size)) { - return error::kOutOfBounds; - } - const GLuint* arrays = GetSharedMemoryAs<const GLuint*>( - c.arrays_shm_id, c.arrays_shm_offset, data_size); - if (arrays == NULL) { - return error::kOutOfBounds; - } - DeleteVertexArraysOESHelper(n, arrays); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleDeleteVertexArraysOESImmediate( uint32_t immediate_data_size, const gles2::cmds::DeleteVertexArraysOESImmediate& c) { @@ -3224,28 +2669,6 @@ error::Error GLES2DecoderImpl::HandleCopyTextureCHROMIUM( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUM( - uint32_t immediate_data_size, - const gles2::cmds::ProduceTextureCHROMIUM& c) { - GLenum target = static_cast<GLenum>(c.target); - uint32_t data_size; - if (!ComputeDataSize(1, sizeof(GLbyte), 64, &data_size)) { - return error::kOutOfBounds; - } - const GLbyte* mailbox = GetSharedMemoryAs<const GLbyte*>( - c.mailbox_shm_id, c.mailbox_shm_offset, data_size); - if (!validators_->texture_bind_target.IsValid(target)) { - LOCAL_SET_GL_ERROR_INVALID_ENUM( - "glProduceTextureCHROMIUM", target, "target"); - return error::kNoError; - } - if (mailbox == NULL) { - return error::kOutOfBounds; - } - DoProduceTextureCHROMIUM(target, mailbox); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUMImmediate( uint32_t immediate_data_size, const gles2::cmds::ProduceTextureCHROMIUMImmediate& c) { @@ -3271,28 +2694,6 @@ error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUMImmediate( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleConsumeTextureCHROMIUM( - uint32_t immediate_data_size, - const gles2::cmds::ConsumeTextureCHROMIUM& c) { - GLenum target = static_cast<GLenum>(c.target); - uint32_t data_size; - if (!ComputeDataSize(1, sizeof(GLbyte), 64, &data_size)) { - return error::kOutOfBounds; - } - const GLbyte* mailbox = GetSharedMemoryAs<const GLbyte*>( - c.mailbox_shm_id, c.mailbox_shm_offset, data_size); - if (!validators_->texture_bind_target.IsValid(target)) { - LOCAL_SET_GL_ERROR_INVALID_ENUM( - "glConsumeTextureCHROMIUM", target, "target"); - return error::kNoError; - } - if (mailbox == NULL) { - return error::kOutOfBounds; - } - DoConsumeTextureCHROMIUM(target, mailbox); - return error::kNoError; -} - error::Error GLES2DecoderImpl::HandleConsumeTextureCHROMIUMImmediate( uint32_t immediate_data_size, const gles2::cmds::ConsumeTextureCHROMIUMImmediate& c) { @@ -3353,32 +2754,16 @@ error::Error GLES2DecoderImpl::HandleTraceEndCHROMIUM( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleDiscardFramebufferEXT( +error::Error GLES2DecoderImpl::HandleDiscardFramebufferEXTImmediate( 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_t data_size; - if (!ComputeDataSize(count, sizeof(GLenum), 1, &data_size)) { - return error::kOutOfBounds; - } - const GLenum* attachments = GetSharedMemoryAs<const GLenum*>( - c.attachments_shm_id, c.attachments_shm_offset, data_size); - if (count < 0) { - LOCAL_SET_GL_ERROR( - GL_INVALID_VALUE, "glDiscardFramebufferEXT", "count < 0"); + const gles2::cmds::DiscardFramebufferEXTImmediate& c) { + if (!features().ext_discard_framebuffer) { + LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, + "glDiscardFramebufferEXT", + "function not available"); return error::kNoError; } - if (attachments == NULL) { - return error::kOutOfBounds; - } - DoDiscardFramebufferEXT(target, count, attachments); - return error::kNoError; -} -error::Error GLES2DecoderImpl::HandleDiscardFramebufferEXTImmediate( - 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_t data_size; @@ -3402,24 +2787,21 @@ error::Error GLES2DecoderImpl::HandleDiscardFramebufferEXTImmediate( return error::kNoError; } -error::Error GLES2DecoderImpl::HandleDrawBuffersEXT( +error::Error GLES2DecoderImpl::HandleLoseContextCHROMIUM( uint32_t immediate_data_size, - const gles2::cmds::DrawBuffersEXT& c) { - GLsizei count = static_cast<GLsizei>(c.count); - uint32_t data_size; - if (!ComputeDataSize(count, sizeof(GLenum), 1, &data_size)) { - return error::kOutOfBounds; - } - const GLenum* bufs = GetSharedMemoryAs<const GLenum*>( - c.bufs_shm_id, c.bufs_shm_offset, data_size); - if (count < 0) { - LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glDrawBuffersEXT", "count < 0"); + const gles2::cmds::LoseContextCHROMIUM& c) { + GLenum current = static_cast<GLenum>(c.current); + GLenum other = static_cast<GLenum>(c.other); + if (!validators_->reset_status.IsValid(current)) { + LOCAL_SET_GL_ERROR_INVALID_ENUM( + "glLoseContextCHROMIUM", current, "current"); return error::kNoError; } - if (bufs == NULL) { - return error::kOutOfBounds; + if (!validators_->reset_status.IsValid(other)) { + LOCAL_SET_GL_ERROR_INVALID_ENUM("glLoseContextCHROMIUM", other, "other"); + return error::kNoError; } - DoDrawBuffersEXT(count, bufs); + DoLoseContextCHROMIUM(current, other); return error::kNoError; } diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc index f3f932175e..f97a6dc5b9 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc @@ -35,6 +35,7 @@ using ::gfx::MockGLInterface; using ::testing::_; +using ::testing::AtLeast; using ::testing::DoAll; using ::testing::InSequence; using ::testing::Invoke; @@ -1067,7 +1068,6 @@ TEST_P(GLES2DecoderManualInitTest, MemoryTrackerTexImage2D) { GL_RGBA, 4, 4, - 0, GL_RGBA, GL_UNSIGNED_BYTE, kSharedMemoryId, @@ -1128,7 +1128,7 @@ TEST_P(GLES2DecoderManualInitTest, MemoryTrackerCopyTexImage2D) { .Times(1) .RetiresOnSaturation(); CopyTexImage2D cmd; - cmd.Init(target, level, internal_format, 0, 0, width, height, border); + cmd.Init(target, level, internal_format, 0, 0, width, height); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(128u, memory_tracker->GetPoolSize(MemoryTracker::kUnmanaged)); EXPECT_EQ(GL_NO_ERROR, GetGLError()); @@ -1210,6 +1210,80 @@ TEST_P(GLES2DecoderManualInitTest, MemoryTrackerBufferData) { EXPECT_EQ(128u, memory_tracker->GetPoolSize(MemoryTracker::kManaged)); } +TEST_P(GLES2DecoderManualInitTest, ImmutableCopyTexImage2D) { + const GLenum kTarget = GL_TEXTURE_2D; + const GLint kLevel = 0; + const GLenum kInternalFormat = GL_RGBA; + const GLenum kSizedInternalFormat = GL_RGBA8; + const GLsizei kWidth = 4; + const GLsizei kHeight = 8; + const GLint kBorder = 0; + InitState init; + init.extensions = "GL_EXT_texture_storage"; + init.gl_version = "3.0"; + init.has_alpha = true; + init.request_alpha = true; + init.bind_generates_resource = true; + InitDecoder(init); + DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId); + + // CopyTexImage2D will call arbitrary amount of GetErrors. + EXPECT_CALL(*gl_, GetError()) + .Times(AtLeast(1)); + + EXPECT_CALL(*gl_, + CopyTexImage2D( + kTarget, kLevel, kInternalFormat, 0, 0, kWidth, kHeight, + kBorder)) + .Times(1); + + EXPECT_CALL(*gl_, + TexStorage2DEXT( + kTarget, kLevel, kSizedInternalFormat, kWidth, kHeight)) + .Times(1); + CopyTexImage2D copy_cmd; + copy_cmd.Init(kTarget, kLevel, kInternalFormat, 0, 0, kWidth, kHeight); + EXPECT_EQ(error::kNoError, ExecuteCmd(copy_cmd)); + EXPECT_EQ(GL_NO_ERROR, GetGLError()); + + TexStorage2DEXT storage_cmd; + storage_cmd.Init(kTarget, kLevel, kSizedInternalFormat, kWidth, kHeight); + EXPECT_EQ(error::kNoError, ExecuteCmd(storage_cmd)); + EXPECT_EQ(GL_NO_ERROR, GetGLError()); + + // This should not invoke CopyTexImage2D. + copy_cmd.Init(kTarget, kLevel, kInternalFormat, 0, 0, kWidth, kHeight); + EXPECT_EQ(error::kNoError, ExecuteCmd(copy_cmd)); + EXPECT_EQ(GL_INVALID_OPERATION, GetGLError()); +} + +TEST_P(GLES2DecoderTest, LoseContextCHROMIUMValidArgs) { + EXPECT_CALL(*mock_decoder_, LoseContext(GL_GUILTY_CONTEXT_RESET_ARB)) + .Times(1); + cmds::LoseContextCHROMIUM cmd; + cmd.Init(GL_GUILTY_CONTEXT_RESET_ARB, GL_GUILTY_CONTEXT_RESET_ARB); + EXPECT_EQ(error::kLostContext, ExecuteCmd(cmd)); + EXPECT_EQ(GL_NO_ERROR, GetGLError()); +} + +TEST_P(GLES2DecoderTest, LoseContextCHROMIUMInvalidArgs0_0) { + EXPECT_CALL(*mock_decoder_, LoseContext(_)) + .Times(0); + cmds::LoseContextCHROMIUM cmd; + cmd.Init(GL_NONE, GL_GUILTY_CONTEXT_RESET_ARB); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); +} + +TEST_P(GLES2DecoderTest, LoseContextCHROMIUMInvalidArgs1_0) { + EXPECT_CALL(*mock_decoder_, LoseContext(_)) + .Times(0); + cmds::LoseContextCHROMIUM cmd; + cmd.Init(GL_GUILTY_CONTEXT_RESET_ARB, GL_NONE); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); +} + INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderTest, ::testing::Bool()); INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderWithShaderTest, ::testing::Bool()); 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 ebe62fb86a..8d605c5cd5 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 @@ -431,25 +431,6 @@ TEST_P(GLES2DecoderTest1, CullFaceValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest1, DeleteBuffersValidArgs) { - EXPECT_CALL(*gl_, DeleteBuffersARB(1, Pointee(kServiceBufferId))).Times(1); - GetSharedMemoryAs<GLuint*>()[0] = client_buffer_id_; - SpecializedSetup<cmds::DeleteBuffers, 0>(true); - cmds::DeleteBuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); - EXPECT_TRUE(GetBuffer(client_buffer_id_) == NULL); -} - -TEST_P(GLES2DecoderTest1, DeleteBuffersInvalidArgs) { - GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId; - SpecializedSetup<cmds::DeleteBuffers, 0>(false); - cmds::DeleteBuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest1, DeleteBuffersImmediateValidArgs) { EXPECT_CALL(*gl_, DeleteBuffersARB(1, Pointee(kServiceBufferId))).Times(1); cmds::DeleteBuffersImmediate& cmd = @@ -471,26 +452,6 @@ TEST_P(GLES2DecoderTest1, DeleteBuffersImmediateInvalidArgs) { EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp))); } -TEST_P(GLES2DecoderTest1, DeleteFramebuffersValidArgs) { - EXPECT_CALL(*gl_, DeleteFramebuffersEXT(1, Pointee(kServiceFramebufferId))) - .Times(1); - GetSharedMemoryAs<GLuint*>()[0] = client_framebuffer_id_; - SpecializedSetup<cmds::DeleteFramebuffers, 0>(true); - cmds::DeleteFramebuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); - EXPECT_TRUE(GetFramebuffer(client_framebuffer_id_) == NULL); -} - -TEST_P(GLES2DecoderTest1, DeleteFramebuffersInvalidArgs) { - GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId; - SpecializedSetup<cmds::DeleteFramebuffers, 0>(false); - cmds::DeleteFramebuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest1, DeleteFramebuffersImmediateValidArgs) { EXPECT_CALL(*gl_, DeleteFramebuffersEXT(1, Pointee(kServiceFramebufferId))) .Times(1); @@ -522,26 +483,6 @@ TEST_P(GLES2DecoderTest1, DeleteProgramValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest1, DeleteRenderbuffersValidArgs) { - EXPECT_CALL(*gl_, DeleteRenderbuffersEXT(1, Pointee(kServiceRenderbufferId))) - .Times(1); - GetSharedMemoryAs<GLuint*>()[0] = client_renderbuffer_id_; - SpecializedSetup<cmds::DeleteRenderbuffers, 0>(true); - cmds::DeleteRenderbuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); - EXPECT_TRUE(GetRenderbuffer(client_renderbuffer_id_) == NULL); -} - -TEST_P(GLES2DecoderTest1, DeleteRenderbuffersInvalidArgs) { - GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId; - SpecializedSetup<cmds::DeleteRenderbuffers, 0>(false); - cmds::DeleteRenderbuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest1, DeleteRenderbuffersImmediateValidArgs) { EXPECT_CALL(*gl_, DeleteRenderbuffersEXT(1, Pointee(kServiceRenderbufferId))) .Times(1); @@ -573,25 +514,6 @@ TEST_P(GLES2DecoderTest1, DeleteShaderValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest1, DeleteTexturesValidArgs) { - EXPECT_CALL(*gl_, DeleteTextures(1, Pointee(kServiceTextureId))).Times(1); - GetSharedMemoryAs<GLuint*>()[0] = client_texture_id_; - SpecializedSetup<cmds::DeleteTextures, 0>(true); - cmds::DeleteTextures cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); - EXPECT_TRUE(GetTexture(client_texture_id_) == NULL); -} - -TEST_P(GLES2DecoderTest1, DeleteTexturesInvalidArgs) { - GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId; - SpecializedSetup<cmds::DeleteTextures, 0>(false); - cmds::DeleteTextures cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest1, DeleteTexturesImmediateValidArgs) { EXPECT_CALL(*gl_, DeleteTextures(1, Pointee(kServiceTextureId))).Times(1); cmds::DeleteTexturesImmediate& cmd = @@ -802,11 +724,8 @@ TEST_P(GLES2DecoderTest1, FramebufferTexture2DValidArgs) { 0)); SpecializedSetup<cmds::FramebufferTexture2D, 0>(true); cmds::FramebufferTexture2D cmd; - cmd.Init(GL_FRAMEBUFFER, - GL_COLOR_ATTACHMENT0, - GL_TEXTURE_2D, - client_texture_id_, - 0); + cmd.Init( + GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, client_texture_id_); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_NO_ERROR, GetGLError()); } @@ -818,8 +737,7 @@ TEST_P(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs0_0) { cmd.Init(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, - client_texture_id_, - 0); + client_texture_id_); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); } @@ -831,8 +749,7 @@ TEST_P(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs0_1) { cmd.Init(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, - client_texture_id_, - 0); + client_texture_id_); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); } @@ -844,25 +761,11 @@ TEST_P(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs2_0) { cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_PROXY_TEXTURE_CUBE_MAP, - client_texture_id_, - 0); + client_texture_id_); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); } -TEST_P(GLES2DecoderTest1, FramebufferTexture2DInvalidArgs4_0) { - EXPECT_CALL(*gl_, FramebufferTexture2DEXT(_, _, _, _, _)).Times(0); - SpecializedSetup<cmds::FramebufferTexture2D, 0>(false); - cmds::FramebufferTexture2D cmd; - cmd.Init(GL_FRAMEBUFFER, - GL_COLOR_ATTACHMENT0, - GL_TEXTURE_2D, - client_texture_id_, - 1); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); -} - TEST_P(GLES2DecoderTest1, FrontFaceValidArgs) { EXPECT_CALL(*gl_, FrontFace(GL_CW)); SpecializedSetup<cmds::FrontFace, 0>(true); @@ -872,27 +775,6 @@ TEST_P(GLES2DecoderTest1, FrontFaceValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest1, GenBuffersValidArgs) { - EXPECT_CALL(*gl_, GenBuffersARB(1, _)) - .WillOnce(SetArgumentPointee<1>(kNewServiceId)); - GetSharedMemoryAs<GLuint*>()[0] = kNewClientId; - SpecializedSetup<cmds::GenBuffers, 0>(true); - cmds::GenBuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); - EXPECT_TRUE(GetBuffer(kNewClientId) != NULL); -} - -TEST_P(GLES2DecoderTest1, GenBuffersInvalidArgs) { - EXPECT_CALL(*gl_, GenBuffersARB(_, _)).Times(0); - GetSharedMemoryAs<GLuint*>()[0] = client_buffer_id_; - SpecializedSetup<cmds::GenBuffers, 0>(false); - cmds::GenBuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest1, GenBuffersImmediateValidArgs) { EXPECT_CALL(*gl_, GenBuffersARB(1, _)) .WillOnce(SetArgumentPointee<1>(kNewServiceId)); @@ -941,27 +823,6 @@ TEST_P(GLES2DecoderTest1, GenerateMipmapInvalidArgs0_1) { EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); } -TEST_P(GLES2DecoderTest1, GenFramebuffersValidArgs) { - EXPECT_CALL(*gl_, GenFramebuffersEXT(1, _)) - .WillOnce(SetArgumentPointee<1>(kNewServiceId)); - GetSharedMemoryAs<GLuint*>()[0] = kNewClientId; - SpecializedSetup<cmds::GenFramebuffers, 0>(true); - cmds::GenFramebuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); - EXPECT_TRUE(GetFramebuffer(kNewClientId) != NULL); -} - -TEST_P(GLES2DecoderTest1, GenFramebuffersInvalidArgs) { - EXPECT_CALL(*gl_, GenFramebuffersEXT(_, _)).Times(0); - GetSharedMemoryAs<GLuint*>()[0] = client_framebuffer_id_; - SpecializedSetup<cmds::GenFramebuffers, 0>(false); - cmds::GenFramebuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest1, GenFramebuffersImmediateValidArgs) { EXPECT_CALL(*gl_, GenFramebuffersEXT(1, _)) .WillOnce(SetArgumentPointee<1>(kNewServiceId)); @@ -985,27 +846,6 @@ TEST_P(GLES2DecoderTest1, GenFramebuffersImmediateInvalidArgs) { ExecuteImmediateCmd(*cmd, sizeof(&client_framebuffer_id_))); } -TEST_P(GLES2DecoderTest1, GenRenderbuffersValidArgs) { - EXPECT_CALL(*gl_, GenRenderbuffersEXT(1, _)) - .WillOnce(SetArgumentPointee<1>(kNewServiceId)); - GetSharedMemoryAs<GLuint*>()[0] = kNewClientId; - SpecializedSetup<cmds::GenRenderbuffers, 0>(true); - cmds::GenRenderbuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); - EXPECT_TRUE(GetRenderbuffer(kNewClientId) != NULL); -} - -TEST_P(GLES2DecoderTest1, GenRenderbuffersInvalidArgs) { - EXPECT_CALL(*gl_, GenRenderbuffersEXT(_, _)).Times(0); - GetSharedMemoryAs<GLuint*>()[0] = client_renderbuffer_id_; - SpecializedSetup<cmds::GenRenderbuffers, 0>(false); - cmds::GenRenderbuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest1, GenRenderbuffersImmediateValidArgs) { EXPECT_CALL(*gl_, GenRenderbuffersEXT(1, _)) .WillOnce(SetArgumentPointee<1>(kNewServiceId)); @@ -1029,27 +869,6 @@ TEST_P(GLES2DecoderTest1, GenRenderbuffersImmediateInvalidArgs) { ExecuteImmediateCmd(*cmd, sizeof(&client_renderbuffer_id_))); } -TEST_P(GLES2DecoderTest1, GenTexturesValidArgs) { - EXPECT_CALL(*gl_, GenTextures(1, _)) - .WillOnce(SetArgumentPointee<1>(kNewServiceId)); - GetSharedMemoryAs<GLuint*>()[0] = kNewClientId; - SpecializedSetup<cmds::GenTextures, 0>(true); - cmds::GenTextures cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); - EXPECT_TRUE(GetTexture(kNewClientId) != NULL); -} - -TEST_P(GLES2DecoderTest1, GenTexturesInvalidArgs) { - EXPECT_CALL(*gl_, GenTextures(_, _)).Times(0); - GetSharedMemoryAs<GLuint*>()[0] = client_texture_id_; - SpecializedSetup<cmds::GenTextures, 0>(false); - cmds::GenTextures cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest1, GenTexturesImmediateValidArgs) { EXPECT_CALL(*gl_, GenTextures(1, _)) .WillOnce(SetArgumentPointee<1>(kNewServiceId)); @@ -2003,4 +1822,95 @@ TEST_P(GLES2DecoderTest1, IsProgramInvalidArgsBadSharedMemoryId) { cmd.Init(client_program_id_, shared_memory_id_, kInvalidSharedMemoryOffset); EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); } + +TEST_P(GLES2DecoderTest1, IsRenderbufferValidArgs) { + SpecializedSetup<cmds::IsRenderbuffer, 0>(true); + cmds::IsRenderbuffer cmd; + cmd.Init(client_renderbuffer_id_, shared_memory_id_, shared_memory_offset_); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_NO_ERROR, GetGLError()); +} + +TEST_P(GLES2DecoderTest1, IsRenderbufferInvalidArgsBadSharedMemoryId) { + SpecializedSetup<cmds::IsRenderbuffer, 0>(false); + cmds::IsRenderbuffer cmd; + cmd.Init( + client_renderbuffer_id_, kInvalidSharedMemoryId, shared_memory_offset_); + EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); + cmd.Init( + client_renderbuffer_id_, shared_memory_id_, kInvalidSharedMemoryOffset); + EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); +} + +TEST_P(GLES2DecoderTest1, IsShaderValidArgs) { + SpecializedSetup<cmds::IsShader, 0>(true); + cmds::IsShader cmd; + cmd.Init(client_shader_id_, shared_memory_id_, shared_memory_offset_); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_NO_ERROR, GetGLError()); +} + +TEST_P(GLES2DecoderTest1, IsShaderInvalidArgsBadSharedMemoryId) { + SpecializedSetup<cmds::IsShader, 0>(false); + cmds::IsShader cmd; + cmd.Init(client_shader_id_, kInvalidSharedMemoryId, shared_memory_offset_); + EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); + cmd.Init(client_shader_id_, shared_memory_id_, kInvalidSharedMemoryOffset); + EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); +} + +TEST_P(GLES2DecoderTest1, IsTextureValidArgs) { + SpecializedSetup<cmds::IsTexture, 0>(true); + cmds::IsTexture cmd; + cmd.Init(client_texture_id_, shared_memory_id_, shared_memory_offset_); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_NO_ERROR, GetGLError()); +} + +TEST_P(GLES2DecoderTest1, IsTextureInvalidArgsBadSharedMemoryId) { + SpecializedSetup<cmds::IsTexture, 0>(false); + cmds::IsTexture cmd; + cmd.Init(client_texture_id_, kInvalidSharedMemoryId, shared_memory_offset_); + EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); + cmd.Init(client_texture_id_, shared_memory_id_, kInvalidSharedMemoryOffset); + EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); +} + +TEST_P(GLES2DecoderTest1, LineWidthValidArgs) { + EXPECT_CALL(*gl_, LineWidth(0.5f)); + SpecializedSetup<cmds::LineWidth, 0>(true); + cmds::LineWidth cmd; + cmd.Init(0.5f); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_NO_ERROR, GetGLError()); +} + +TEST_P(GLES2DecoderTest1, LineWidthInvalidValue0_0) { + SpecializedSetup<cmds::LineWidth, 0>(false); + cmds::LineWidth cmd; + cmd.Init(0.0f); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); +} + +TEST_P(GLES2DecoderTest1, LinkProgramValidArgs) { + EXPECT_CALL(*gl_, LinkProgram(kServiceProgramId)); + SpecializedSetup<cmds::LinkProgram, 0>(true); + cmds::LinkProgram cmd; + cmd.Init(client_program_id_); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_NO_ERROR, GetGLError()); +} +// TODO(gman): PixelStorei + +TEST_P(GLES2DecoderTest1, PolygonOffsetValidArgs) { + EXPECT_CALL(*gl_, PolygonOffset(1, 2)); + SpecializedSetup<cmds::PolygonOffset, 0>(true); + cmds::PolygonOffset cmd; + cmd.Init(1, 2); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_NO_ERROR, GetGLError()); +} +// TODO(gman): ReadPixels + #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_1_AUTOGEN_H_ diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc index b162d4d7b5..de52efe090 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc @@ -61,9 +61,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase { { valid_uniform = accepts_apis & Program::kUniform1i; - cmds::Uniform1iv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::Uniform1ivImmediate& cmd = + *GetImmediateAs<cmds::Uniform1ivImmediate>(); + GLint data[2][1] = {{0}}; + cmd.Init(1, 2, &data[0][0]); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data))); EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION, GetGLError()); } @@ -79,9 +81,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase { { valid_uniform = accepts_apis & Program::kUniform2i; - cmds::Uniform2iv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::Uniform2ivImmediate& cmd = + *GetImmediateAs<cmds::Uniform2ivImmediate>(); + GLint data[2][2] = {{0}}; + cmd.Init(1, 2, &data[0][0]); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data))); EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION, GetGLError()); } @@ -97,9 +101,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase { { valid_uniform = accepts_apis & Program::kUniform3i; - cmds::Uniform3iv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::Uniform3ivImmediate& cmd = + *GetImmediateAs<cmds::Uniform3ivImmediate>(); + GLint data[2][3] = {{0}}; + cmd.Init(1, 2, &data[0][0]); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data))); EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION, GetGLError()); } @@ -115,9 +121,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase { { valid_uniform = accepts_apis & Program::kUniform4i; - cmds::Uniform4iv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::Uniform4ivImmediate& cmd = + *GetImmediateAs<cmds::Uniform4ivImmediate>(); + GLint data[2][4] = {{0}}; + cmd.Init(1, 2, &data[0][0]); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data))); EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION, GetGLError()); } @@ -135,9 +143,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase { { valid_uniform = accepts_apis & Program::kUniform1f; - cmds::Uniform1fv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::Uniform1fvImmediate& cmd = + *GetImmediateAs<cmds::Uniform1fvImmediate>(); + GLfloat data[2][1] = {{0.0f}}; + cmd.Init(1, 2, &data[0][0]); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data))); EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION, GetGLError()); } @@ -153,9 +163,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase { { valid_uniform = accepts_apis & Program::kUniform2f; - cmds::Uniform2fv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::Uniform2fvImmediate& cmd = + *GetImmediateAs<cmds::Uniform2fvImmediate>(); + GLfloat data[2][2] = {{0.0f}}; + cmd.Init(1, 2, &data[0][0]); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data))); EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION, GetGLError()); } @@ -171,9 +183,11 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase { { valid_uniform = accepts_apis & Program::kUniform3f; - cmds::Uniform3fv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::Uniform3fvImmediate& cmd = + *GetImmediateAs<cmds::Uniform3fvImmediate>(); + GLfloat data[2][3] = {{0.0f}}; + cmd.Init(1, 2, &data[0][0]); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data))); EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION, GetGLError()); } @@ -189,36 +203,45 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase { { valid_uniform = accepts_apis & Program::kUniform4f; - cmds::Uniform4fv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::Uniform4fvImmediate& cmd = + *GetImmediateAs<cmds::Uniform4fvImmediate>(); + GLfloat data[2][4] = {{0.0f}}; + cmd.Init(1, 2, &data[0][0]); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data))); EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION, GetGLError()); } { valid_uniform = accepts_apis & Program::kUniformMatrix2f; - cmds::UniformMatrix2fv cmd; - cmd.Init(1, 2, false, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::UniformMatrix2fvImmediate& cmd = + *GetImmediateAs<cmds::UniformMatrix2fvImmediate>(); + GLfloat data[2][2 * 2] = {{0.0f}}; + + cmd.Init(1, 2, &data[0][0]); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data))); EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION, GetGLError()); } { valid_uniform = accepts_apis & Program::kUniformMatrix3f; - cmds::UniformMatrix3fv cmd; - cmd.Init(1, 2, false, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::UniformMatrix3fvImmediate& cmd = + *GetImmediateAs<cmds::UniformMatrix3fvImmediate>(); + GLfloat data[2][3 * 3] = {{0.0f}}; + cmd.Init(1, 2, &data[0][0]); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data))); EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION, GetGLError()); } { valid_uniform = accepts_apis & Program::kUniformMatrix4f; - cmds::UniformMatrix4fv cmd; - cmd.Init(1, 2, false, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::UniformMatrix4fvImmediate& cmd = + *GetImmediateAs<cmds::UniformMatrix4fvImmediate>(); + GLfloat data[2][4 * 4] = {{0.0f}}; + cmd.Init(1, 2, &data[0][0]); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(data))); EXPECT_EQ(valid_uniform ? GL_NO_ERROR : GL_INVALID_OPERATION, GetGLError()); } @@ -228,40 +251,16 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase { INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderTest2, ::testing::Bool()); template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::GenQueriesEXT, 0>( - bool valid) { - if (!valid) { - // Make the client_query_id_ so that trying to make it again - // will fail. - GetSharedMemoryAs<GLuint*>()[0] = client_query_id_; - cmds::GenQueriesEXT cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - } -}; - -template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::GenQueriesEXTImmediate, 0>( bool valid) { if (!valid) { // Make the client_query_id_ so that trying to make it again // will fail. - GetSharedMemoryAs<GLuint*>()[0] = client_query_id_; - cmds::GenQueriesEXT cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - } -}; - -template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::DeleteQueriesEXT, 0>( - bool valid) { - if (valid) { - // Make the client_query_id_ so that trying to delete it will succeed. - GetSharedMemoryAs<GLuint*>()[0] = client_query_id_; - cmds::GenQueriesEXT cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::GenQueriesEXTImmediate& cmd = + *GetImmediateAs<cmds::GenQueriesEXTImmediate>(); + cmd.Init(1, &client_query_id_); + EXPECT_EQ(error::kNoError, + ExecuteImmediateCmd(cmd, sizeof(client_query_id_))); } }; @@ -270,10 +269,11 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::DeleteQueriesEXTImmediate, 0>( bool valid) { if (valid) { // Make the client_query_id_ so that trying to delete it will succeed. - GetSharedMemoryAs<GLuint*>()[0] = client_query_id_; - cmds::GenQueriesEXT cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + cmds::GenQueriesEXTImmediate& cmd = + *GetImmediateAs<cmds::GenQueriesEXTImmediate>(); + cmd.Init(1, &client_query_id_); + EXPECT_EQ(error::kNoError, + ExecuteImmediateCmd(cmd, sizeof(client_query_id_))); } }; @@ -370,24 +370,12 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1f, 0>( }; template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1fv, 0>( - bool /* valid */) { - SetupShaderForUniform(GL_FLOAT); -}; - -template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1fvImmediate, 0>( bool /* valid */) { SetupShaderForUniform(GL_FLOAT); }; template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1iv, 0>( - bool /* valid */) { - SetupShaderForUniform(GL_INT); -}; - -template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform1ivImmediate, 0>( bool /* valid */) { SetupShaderForUniform(GL_INT); @@ -406,18 +394,6 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2i, 0>( }; template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2fv, 0>( - bool /* valid */) { - SetupShaderForUniform(GL_FLOAT_VEC2); -}; - -template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2iv, 0>( - bool /* valid */) { - SetupShaderForUniform(GL_INT_VEC2); -}; - -template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform2fvImmediate, 0>( bool /* valid */) { SetupShaderForUniform(GL_FLOAT_VEC2); @@ -442,18 +418,6 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3i, 0>( }; template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3fv, 0>( - bool /* valid */) { - SetupShaderForUniform(GL_FLOAT_VEC3); -}; - -template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3iv, 0>( - bool /* valid */) { - SetupShaderForUniform(GL_INT_VEC3); -}; - -template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform3fvImmediate, 0>( bool /* valid */) { SetupShaderForUniform(GL_FLOAT_VEC3); @@ -478,18 +442,6 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4i, 0>( }; template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4fv, 0>( - bool /* valid */) { - SetupShaderForUniform(GL_FLOAT_VEC4); -}; - -template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4iv, 0>( - bool /* valid */) { - SetupShaderForUniform(GL_INT_VEC4); -}; - -template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4fvImmediate, 0>( bool /* valid */) { SetupShaderForUniform(GL_FLOAT_VEC4); @@ -502,36 +454,18 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::Uniform4ivImmediate, 0>( }; template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix2fv, 0>( - bool /* valid */) { - SetupShaderForUniform(GL_FLOAT_MAT2); -}; - -template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix2fvImmediate, 0>( bool /* valid */) { SetupShaderForUniform(GL_FLOAT_MAT2); }; template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix3fv, 0>( - bool /* valid */) { - SetupShaderForUniform(GL_FLOAT_MAT3); -}; - -template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix3fvImmediate, 0>( bool /* valid */) { SetupShaderForUniform(GL_FLOAT_MAT3); }; template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix4fv, 0>( - bool /* valid */) { - SetupShaderForUniform(GL_FLOAT_MAT4); -}; - -template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::UniformMatrix4fvImmediate, 0>( bool /* valid */) { SetupShaderForUniform(GL_FLOAT_MAT4); @@ -569,24 +503,12 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameteri, 0>( }; template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameterfv, 0>( - bool /* valid */) { - DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId); -}; - -template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameterfvImmediate, 0>( bool /* valid */) { DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId); }; template <> -void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameteriv, 0>( - bool /* valid */) { - DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId); -}; - -template <> void GLES2DecoderTestBase::SpecializedSetup<cmds::TexParameterivImmediate, 0>( bool /* valid */) { DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId); 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 209b1e67b7..80dc8f7f01 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 @@ -12,96 +12,6 @@ #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_2_AUTOGEN_H_ #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_2_AUTOGEN_H_ -TEST_P(GLES2DecoderTest2, IsRenderbufferValidArgs) { - SpecializedSetup<cmds::IsRenderbuffer, 0>(true); - cmds::IsRenderbuffer cmd; - cmd.Init(client_renderbuffer_id_, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, IsRenderbufferInvalidArgsBadSharedMemoryId) { - SpecializedSetup<cmds::IsRenderbuffer, 0>(false); - cmds::IsRenderbuffer cmd; - cmd.Init( - client_renderbuffer_id_, kInvalidSharedMemoryId, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - cmd.Init( - client_renderbuffer_id_, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, IsShaderValidArgs) { - SpecializedSetup<cmds::IsShader, 0>(true); - cmds::IsShader cmd; - cmd.Init(client_shader_id_, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, IsShaderInvalidArgsBadSharedMemoryId) { - SpecializedSetup<cmds::IsShader, 0>(false); - cmds::IsShader cmd; - cmd.Init(client_shader_id_, kInvalidSharedMemoryId, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - cmd.Init(client_shader_id_, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, IsTextureValidArgs) { - SpecializedSetup<cmds::IsTexture, 0>(true); - cmds::IsTexture cmd; - cmd.Init(client_texture_id_, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, IsTextureInvalidArgsBadSharedMemoryId) { - SpecializedSetup<cmds::IsTexture, 0>(false); - cmds::IsTexture cmd; - cmd.Init(client_texture_id_, kInvalidSharedMemoryId, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - cmd.Init(client_texture_id_, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, LineWidthValidArgs) { - EXPECT_CALL(*gl_, LineWidth(0.5f)); - SpecializedSetup<cmds::LineWidth, 0>(true); - cmds::LineWidth cmd; - cmd.Init(0.5f); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, LineWidthInvalidValue0_0) { - SpecializedSetup<cmds::LineWidth, 0>(false); - cmds::LineWidth cmd; - cmd.Init(0.0f); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, LinkProgramValidArgs) { - EXPECT_CALL(*gl_, LinkProgram(kServiceProgramId)); - SpecializedSetup<cmds::LinkProgram, 0>(true); - cmds::LinkProgram cmd; - cmd.Init(client_program_id_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} -// TODO(gman): PixelStorei - -TEST_P(GLES2DecoderTest2, PolygonOffsetValidArgs) { - EXPECT_CALL(*gl_, PolygonOffset(1, 2)); - SpecializedSetup<cmds::PolygonOffset, 0>(true); - cmds::PolygonOffset cmd; - cmd.Init(1, 2); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} -// TODO(gman): ReadPixels - // TODO(gman): ReleaseShaderCompiler TEST_P(GLES2DecoderTest2, RenderbufferStorageValidArgs) { @@ -270,83 +180,6 @@ TEST_P(GLES2DecoderTest2, TexParameterfInvalidArgs1_0) { EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); } -TEST_P(GLES2DecoderTest2, TexParameterfvValidArgs) { - SpecializedSetup<cmds::TexParameterfv, 0>(true); - cmds::TexParameterfv cmd; - cmd.Init(GL_TEXTURE_2D, - GL_TEXTURE_MAG_FILTER, - shared_memory_id_, - shared_memory_offset_); - GetSharedMemoryAs<GLfloat*>()[0] = GL_NEAREST; - EXPECT_CALL( - *gl_, - TexParameterf(GL_TEXTURE_2D, - GL_TEXTURE_MAG_FILTER, - *reinterpret_cast<const GLfloat*>(shared_memory_address_))); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, TexParameterfvInvalidArgs0_0) { - EXPECT_CALL(*gl_, TexParameterf(_, _, _)).Times(0); - SpecializedSetup<cmds::TexParameterfv, 0>(false); - cmds::TexParameterfv cmd; - cmd.Init(GL_TEXTURE_1D, - GL_TEXTURE_MAG_FILTER, - shared_memory_id_, - shared_memory_offset_); - GetSharedMemoryAs<GLfloat*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, TexParameterfvInvalidArgs0_1) { - EXPECT_CALL(*gl_, TexParameterf(_, _, _)).Times(0); - SpecializedSetup<cmds::TexParameterfv, 0>(false); - cmds::TexParameterfv cmd; - cmd.Init(GL_TEXTURE_3D, - GL_TEXTURE_MAG_FILTER, - shared_memory_id_, - shared_memory_offset_); - GetSharedMemoryAs<GLfloat*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, TexParameterfvInvalidArgs1_0) { - EXPECT_CALL(*gl_, TexParameterf(_, _, _)).Times(0); - SpecializedSetup<cmds::TexParameterfv, 0>(false); - cmds::TexParameterfv cmd; - cmd.Init(GL_TEXTURE_2D, - GL_GENERATE_MIPMAP, - shared_memory_id_, - shared_memory_offset_); - GetSharedMemoryAs<GLfloat*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, TexParameterfvInvalidArgs2_0) { - EXPECT_CALL(*gl_, TexParameterf(_, _, _)).Times(0); - SpecializedSetup<cmds::TexParameterfv, 0>(false); - cmds::TexParameterfv cmd; - cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, kInvalidSharedMemoryId, 0); - GetSharedMemoryAs<GLfloat*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, TexParameterfvInvalidArgs2_1) { - EXPECT_CALL(*gl_, TexParameterf(_, _, _)).Times(0); - SpecializedSetup<cmds::TexParameterfv, 0>(false); - cmds::TexParameterfv cmd; - cmd.Init(GL_TEXTURE_2D, - GL_TEXTURE_MAG_FILTER, - shared_memory_id_, - kInvalidSharedMemoryOffset); - GetSharedMemoryAs<GLfloat*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest2, TexParameterfvImmediateValidArgs) { cmds::TexParameterfvImmediate& cmd = *GetImmediateAs<cmds::TexParameterfvImmediate>(); @@ -440,83 +273,6 @@ TEST_P(GLES2DecoderTest2, TexParameteriInvalidArgs1_0) { EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); } -TEST_P(GLES2DecoderTest2, TexParameterivValidArgs) { - SpecializedSetup<cmds::TexParameteriv, 0>(true); - cmds::TexParameteriv cmd; - cmd.Init(GL_TEXTURE_2D, - GL_TEXTURE_MAG_FILTER, - shared_memory_id_, - shared_memory_offset_); - GetSharedMemoryAs<GLint*>()[0] = GL_NEAREST; - EXPECT_CALL( - *gl_, - TexParameteri(GL_TEXTURE_2D, - GL_TEXTURE_MAG_FILTER, - *reinterpret_cast<const GLint*>(shared_memory_address_))); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, TexParameterivInvalidArgs0_0) { - EXPECT_CALL(*gl_, TexParameteri(_, _, _)).Times(0); - SpecializedSetup<cmds::TexParameteriv, 0>(false); - cmds::TexParameteriv cmd; - cmd.Init(GL_TEXTURE_1D, - GL_TEXTURE_MAG_FILTER, - shared_memory_id_, - shared_memory_offset_); - GetSharedMemoryAs<GLint*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, TexParameterivInvalidArgs0_1) { - EXPECT_CALL(*gl_, TexParameteri(_, _, _)).Times(0); - SpecializedSetup<cmds::TexParameteriv, 0>(false); - cmds::TexParameteriv cmd; - cmd.Init(GL_TEXTURE_3D, - GL_TEXTURE_MAG_FILTER, - shared_memory_id_, - shared_memory_offset_); - GetSharedMemoryAs<GLint*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, TexParameterivInvalidArgs1_0) { - EXPECT_CALL(*gl_, TexParameteri(_, _, _)).Times(0); - SpecializedSetup<cmds::TexParameteriv, 0>(false); - cmds::TexParameteriv cmd; - cmd.Init(GL_TEXTURE_2D, - GL_GENERATE_MIPMAP, - shared_memory_id_, - shared_memory_offset_); - GetSharedMemoryAs<GLint*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_ENUM, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, TexParameterivInvalidArgs2_0) { - EXPECT_CALL(*gl_, TexParameteri(_, _, _)).Times(0); - SpecializedSetup<cmds::TexParameteriv, 0>(false); - cmds::TexParameteriv cmd; - cmd.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, kInvalidSharedMemoryId, 0); - GetSharedMemoryAs<GLint*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, TexParameterivInvalidArgs2_1) { - EXPECT_CALL(*gl_, TexParameteri(_, _, _)).Times(0); - SpecializedSetup<cmds::TexParameteriv, 0>(false); - cmds::TexParameteriv cmd; - cmd.Init(GL_TEXTURE_2D, - GL_TEXTURE_MAG_FILTER, - shared_memory_id_, - kInvalidSharedMemoryOffset); - GetSharedMemoryAs<GLint*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest2, TexParameterivImmediateValidArgs) { cmds::TexParameterivImmediate& cmd = *GetImmediateAs<cmds::TexParameterivImmediate>(); @@ -583,58 +339,6 @@ TEST_P(GLES2DecoderTest2, Uniform1fValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, Uniform1fvValidArgs) { - EXPECT_CALL( - *gl_, - Uniform1fv( - 1, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform1fv, 0>(true); - cmds::Uniform1fv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform1fvInvalidArgs1_0) { - EXPECT_CALL(*gl_, Uniform1fv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform1fv, 0>(false); - cmds::Uniform1fv cmd; - cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform1fvInvalidArgs2_0) { - EXPECT_CALL(*gl_, Uniform1fv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform1fv, 0>(false); - cmds::Uniform1fv cmd; - cmd.Init(1, 2, kInvalidSharedMemoryId, 0); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform1fvInvalidArgs2_1) { - EXPECT_CALL(*gl_, Uniform1fv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform1fv, 0>(false); - cmds::Uniform1fv cmd; - cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform1fvValidArgsCountTooLarge) { - EXPECT_CALL( - *gl_, - Uniform1fv( - 3, 3, reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform1fv, 0>(true); - cmds::Uniform1fv cmd; - cmd.Init(ProgramManager::MakeFakeLocation(1, 1), - 5, - shared_memory_id_, - shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - TEST_P(GLES2DecoderTest2, Uniform1fvImmediateValidArgs) { cmds::Uniform1fvImmediate& cmd = *GetImmediateAs<cmds::Uniform1fvImmediate>(); EXPECT_CALL( @@ -649,7 +353,6 @@ TEST_P(GLES2DecoderTest2, Uniform1fvImmediateValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } // TODO(gman): Uniform1i -// TODO(gman): Uniform1iv // TODO(gman): Uniform1ivImmediate TEST_P(GLES2DecoderTest2, Uniform2fValidArgs) { @@ -661,58 +364,6 @@ TEST_P(GLES2DecoderTest2, Uniform2fValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, Uniform2fvValidArgs) { - EXPECT_CALL( - *gl_, - Uniform2fv( - 1, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform2fv, 0>(true); - cmds::Uniform2fv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform2fvInvalidArgs1_0) { - EXPECT_CALL(*gl_, Uniform2fv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform2fv, 0>(false); - cmds::Uniform2fv cmd; - cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform2fvInvalidArgs2_0) { - EXPECT_CALL(*gl_, Uniform2fv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform2fv, 0>(false); - cmds::Uniform2fv cmd; - cmd.Init(1, 2, kInvalidSharedMemoryId, 0); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform2fvInvalidArgs2_1) { - EXPECT_CALL(*gl_, Uniform2fv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform2fv, 0>(false); - cmds::Uniform2fv cmd; - cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform2fvValidArgsCountTooLarge) { - EXPECT_CALL( - *gl_, - Uniform2fv( - 3, 3, reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform2fv, 0>(true); - cmds::Uniform2fv cmd; - cmd.Init(ProgramManager::MakeFakeLocation(1, 1), - 5, - shared_memory_id_, - shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - TEST_P(GLES2DecoderTest2, Uniform2fvImmediateValidArgs) { cmds::Uniform2fvImmediate& cmd = *GetImmediateAs<cmds::Uniform2fvImmediate>(); EXPECT_CALL( @@ -736,56 +387,6 @@ TEST_P(GLES2DecoderTest2, Uniform2iValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, Uniform2ivValidArgs) { - EXPECT_CALL( - *gl_, - Uniform2iv(1, 2, reinterpret_cast<const GLint*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform2iv, 0>(true); - cmds::Uniform2iv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform2ivInvalidArgs1_0) { - EXPECT_CALL(*gl_, Uniform2iv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform2iv, 0>(false); - cmds::Uniform2iv cmd; - cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform2ivInvalidArgs2_0) { - EXPECT_CALL(*gl_, Uniform2iv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform2iv, 0>(false); - cmds::Uniform2iv cmd; - cmd.Init(1, 2, kInvalidSharedMemoryId, 0); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform2ivInvalidArgs2_1) { - EXPECT_CALL(*gl_, Uniform2iv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform2iv, 0>(false); - cmds::Uniform2iv cmd; - cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform2ivValidArgsCountTooLarge) { - EXPECT_CALL( - *gl_, - Uniform2iv(3, 3, reinterpret_cast<const GLint*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform2iv, 0>(true); - cmds::Uniform2iv cmd; - cmd.Init(ProgramManager::MakeFakeLocation(1, 1), - 5, - shared_memory_id_, - shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - TEST_P(GLES2DecoderTest2, Uniform2ivImmediateValidArgs) { cmds::Uniform2ivImmediate& cmd = *GetImmediateAs<cmds::Uniform2ivImmediate>(); EXPECT_CALL( @@ -809,58 +410,6 @@ TEST_P(GLES2DecoderTest2, Uniform3fValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, Uniform3fvValidArgs) { - EXPECT_CALL( - *gl_, - Uniform3fv( - 1, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform3fv, 0>(true); - cmds::Uniform3fv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform3fvInvalidArgs1_0) { - EXPECT_CALL(*gl_, Uniform3fv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform3fv, 0>(false); - cmds::Uniform3fv cmd; - cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform3fvInvalidArgs2_0) { - EXPECT_CALL(*gl_, Uniform3fv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform3fv, 0>(false); - cmds::Uniform3fv cmd; - cmd.Init(1, 2, kInvalidSharedMemoryId, 0); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform3fvInvalidArgs2_1) { - EXPECT_CALL(*gl_, Uniform3fv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform3fv, 0>(false); - cmds::Uniform3fv cmd; - cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform3fvValidArgsCountTooLarge) { - EXPECT_CALL( - *gl_, - Uniform3fv( - 3, 3, reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform3fv, 0>(true); - cmds::Uniform3fv cmd; - cmd.Init(ProgramManager::MakeFakeLocation(1, 1), - 5, - shared_memory_id_, - shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - TEST_P(GLES2DecoderTest2, Uniform3fvImmediateValidArgs) { cmds::Uniform3fvImmediate& cmd = *GetImmediateAs<cmds::Uniform3fvImmediate>(); EXPECT_CALL( @@ -884,56 +433,6 @@ TEST_P(GLES2DecoderTest2, Uniform3iValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, Uniform3ivValidArgs) { - EXPECT_CALL( - *gl_, - Uniform3iv(1, 2, reinterpret_cast<const GLint*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform3iv, 0>(true); - cmds::Uniform3iv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform3ivInvalidArgs1_0) { - EXPECT_CALL(*gl_, Uniform3iv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform3iv, 0>(false); - cmds::Uniform3iv cmd; - cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform3ivInvalidArgs2_0) { - EXPECT_CALL(*gl_, Uniform3iv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform3iv, 0>(false); - cmds::Uniform3iv cmd; - cmd.Init(1, 2, kInvalidSharedMemoryId, 0); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform3ivInvalidArgs2_1) { - EXPECT_CALL(*gl_, Uniform3iv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform3iv, 0>(false); - cmds::Uniform3iv cmd; - cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform3ivValidArgsCountTooLarge) { - EXPECT_CALL( - *gl_, - Uniform3iv(3, 3, reinterpret_cast<const GLint*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform3iv, 0>(true); - cmds::Uniform3iv cmd; - cmd.Init(ProgramManager::MakeFakeLocation(1, 1), - 5, - shared_memory_id_, - shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - TEST_P(GLES2DecoderTest2, Uniform3ivImmediateValidArgs) { cmds::Uniform3ivImmediate& cmd = *GetImmediateAs<cmds::Uniform3ivImmediate>(); EXPECT_CALL( @@ -957,58 +456,6 @@ TEST_P(GLES2DecoderTest2, Uniform4fValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, Uniform4fvValidArgs) { - EXPECT_CALL( - *gl_, - Uniform4fv( - 1, 2, reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform4fv, 0>(true); - cmds::Uniform4fv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform4fvInvalidArgs1_0) { - EXPECT_CALL(*gl_, Uniform4fv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform4fv, 0>(false); - cmds::Uniform4fv cmd; - cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform4fvInvalidArgs2_0) { - EXPECT_CALL(*gl_, Uniform4fv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform4fv, 0>(false); - cmds::Uniform4fv cmd; - cmd.Init(1, 2, kInvalidSharedMemoryId, 0); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform4fvInvalidArgs2_1) { - EXPECT_CALL(*gl_, Uniform4fv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform4fv, 0>(false); - cmds::Uniform4fv cmd; - cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform4fvValidArgsCountTooLarge) { - EXPECT_CALL( - *gl_, - Uniform4fv( - 3, 3, reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform4fv, 0>(true); - cmds::Uniform4fv cmd; - cmd.Init(ProgramManager::MakeFakeLocation(1, 1), - 5, - shared_memory_id_, - shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - TEST_P(GLES2DecoderTest2, Uniform4fvImmediateValidArgs) { cmds::Uniform4fvImmediate& cmd = *GetImmediateAs<cmds::Uniform4fvImmediate>(); EXPECT_CALL( @@ -1032,56 +479,6 @@ TEST_P(GLES2DecoderTest2, Uniform4iValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, Uniform4ivValidArgs) { - EXPECT_CALL( - *gl_, - Uniform4iv(1, 2, reinterpret_cast<const GLint*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform4iv, 0>(true); - cmds::Uniform4iv cmd; - cmd.Init(1, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform4ivInvalidArgs1_0) { - EXPECT_CALL(*gl_, Uniform4iv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform4iv, 0>(false); - cmds::Uniform4iv cmd; - cmd.Init(1, -1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, Uniform4ivInvalidArgs2_0) { - EXPECT_CALL(*gl_, Uniform4iv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform4iv, 0>(false); - cmds::Uniform4iv cmd; - cmd.Init(1, 2, kInvalidSharedMemoryId, 0); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform4ivInvalidArgs2_1) { - EXPECT_CALL(*gl_, Uniform4iv(_, _, _)).Times(0); - SpecializedSetup<cmds::Uniform4iv, 0>(false); - cmds::Uniform4iv cmd; - cmd.Init(1, 2, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, Uniform4ivValidArgsCountTooLarge) { - EXPECT_CALL( - *gl_, - Uniform4iv(3, 3, reinterpret_cast<const GLint*>(shared_memory_address_))); - SpecializedSetup<cmds::Uniform4iv, 0>(true); - cmds::Uniform4iv cmd; - cmd.Init(ProgramManager::MakeFakeLocation(1, 1), - 5, - shared_memory_id_, - shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - TEST_P(GLES2DecoderTest2, Uniform4ivImmediateValidArgs) { cmds::Uniform4ivImmediate& cmd = *GetImmediateAs<cmds::Uniform4ivImmediate>(); EXPECT_CALL( @@ -1096,72 +493,6 @@ TEST_P(GLES2DecoderTest2, Uniform4ivImmediateValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, UniformMatrix2fvValidArgs) { - EXPECT_CALL(*gl_, - UniformMatrix2fv( - 1, - 2, - false, - reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::UniformMatrix2fv, 0>(true); - cmds::UniformMatrix2fv cmd; - cmd.Init(1, 2, false, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs1_0) { - EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix2fv, 0>(false); - cmds::UniformMatrix2fv cmd; - cmd.Init(1, -1, false, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs2_0) { - EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix2fv, 0>(false); - cmds::UniformMatrix2fv cmd; - cmd.Init(1, 2, true, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs3_0) { - EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix2fv, 0>(false); - cmds::UniformMatrix2fv cmd; - cmd.Init(1, 2, false, kInvalidSharedMemoryId, 0); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix2fvInvalidArgs3_1) { - EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix2fv, 0>(false); - cmds::UniformMatrix2fv cmd; - cmd.Init(1, 2, false, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix2fvValidArgsCountTooLarge) { - EXPECT_CALL(*gl_, - UniformMatrix2fv( - 3, - 3, - false, - reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::UniformMatrix2fv, 0>(true); - cmds::UniformMatrix2fv cmd; - cmd.Init(ProgramManager::MakeFakeLocation(1, 1), - 5, - false, - shared_memory_id_, - shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - TEST_P(GLES2DecoderTest2, UniformMatrix2fvImmediateValidArgs) { cmds::UniformMatrix2fvImmediate& cmd = *GetImmediateAs<cmds::UniformMatrix2fvImmediate>(); @@ -1173,90 +504,11 @@ TEST_P(GLES2DecoderTest2, UniformMatrix2fvImmediateValidArgs) { GLfloat temp[4 * 2] = { 0, }; - cmd.Init(1, 2, false, &temp[0]); + cmd.Init(1, 2, &temp[0]); EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp))); EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, UniformMatrix2fvImmediateInvalidArgs2_0) { - cmds::UniformMatrix2fvImmediate& cmd = - *GetImmediateAs<cmds::UniformMatrix2fvImmediate>(); - EXPECT_CALL(*gl_, UniformMatrix2fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix2fvImmediate, 0>(false); - GLfloat temp[4 * 2] = { - 0, - }; - cmd.Init(1, 2, true, &temp[0]); - EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp))); - EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix3fvValidArgs) { - EXPECT_CALL(*gl_, - UniformMatrix3fv( - 1, - 2, - false, - reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::UniformMatrix3fv, 0>(true); - cmds::UniformMatrix3fv cmd; - cmd.Init(1, 2, false, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs1_0) { - EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix3fv, 0>(false); - cmds::UniformMatrix3fv cmd; - cmd.Init(1, -1, false, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs2_0) { - EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix3fv, 0>(false); - cmds::UniformMatrix3fv cmd; - cmd.Init(1, 2, true, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs3_0) { - EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix3fv, 0>(false); - cmds::UniformMatrix3fv cmd; - cmd.Init(1, 2, false, kInvalidSharedMemoryId, 0); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix3fvInvalidArgs3_1) { - EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix3fv, 0>(false); - cmds::UniformMatrix3fv cmd; - cmd.Init(1, 2, false, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix3fvValidArgsCountTooLarge) { - EXPECT_CALL(*gl_, - UniformMatrix3fv( - 3, - 3, - false, - reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::UniformMatrix3fv, 0>(true); - cmds::UniformMatrix3fv cmd; - cmd.Init(ProgramManager::MakeFakeLocation(1, 1), - 5, - false, - shared_memory_id_, - shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - TEST_P(GLES2DecoderTest2, UniformMatrix3fvImmediateValidArgs) { cmds::UniformMatrix3fvImmediate& cmd = *GetImmediateAs<cmds::UniformMatrix3fvImmediate>(); @@ -1268,87 +520,8 @@ TEST_P(GLES2DecoderTest2, UniformMatrix3fvImmediateValidArgs) { GLfloat temp[9 * 2] = { 0, }; - cmd.Init(1, 2, false, &temp[0]); - EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp))); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix3fvImmediateInvalidArgs2_0) { - cmds::UniformMatrix3fvImmediate& cmd = - *GetImmediateAs<cmds::UniformMatrix3fvImmediate>(); - EXPECT_CALL(*gl_, UniformMatrix3fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix3fvImmediate, 0>(false); - GLfloat temp[9 * 2] = { - 0, - }; - cmd.Init(1, 2, true, &temp[0]); + cmd.Init(1, 2, &temp[0]); EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp))); - EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix4fvValidArgs) { - EXPECT_CALL(*gl_, - UniformMatrix4fv( - 1, - 2, - false, - reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::UniformMatrix4fv, 0>(true); - cmds::UniformMatrix4fv cmd; - cmd.Init(1, 2, false, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs1_0) { - EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix4fv, 0>(false); - cmds::UniformMatrix4fv cmd; - cmd.Init(1, -1, false, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs2_0) { - EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix4fv, 0>(false); - cmds::UniformMatrix4fv cmd; - cmd.Init(1, 2, true, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs3_0) { - EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix4fv, 0>(false); - cmds::UniformMatrix4fv cmd; - cmd.Init(1, 2, false, kInvalidSharedMemoryId, 0); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix4fvInvalidArgs3_1) { - EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix4fv, 0>(false); - cmds::UniformMatrix4fv cmd; - cmd.Init(1, 2, false, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, UniformMatrix4fvValidArgsCountTooLarge) { - EXPECT_CALL(*gl_, - UniformMatrix4fv( - 3, - 3, - false, - reinterpret_cast<const GLfloat*>(shared_memory_address_))); - SpecializedSetup<cmds::UniformMatrix4fv, 0>(true); - cmds::UniformMatrix4fv cmd; - cmd.Init(ProgramManager::MakeFakeLocation(1, 1), - 5, - false, - shared_memory_id_, - shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_NO_ERROR, GetGLError()); } @@ -1363,24 +536,11 @@ TEST_P(GLES2DecoderTest2, UniformMatrix4fvImmediateValidArgs) { GLfloat temp[16 * 2] = { 0, }; - cmd.Init(1, 2, false, &temp[0]); + cmd.Init(1, 2, &temp[0]); EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp))); EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, UniformMatrix4fvImmediateInvalidArgs2_0) { - cmds::UniformMatrix4fvImmediate& cmd = - *GetImmediateAs<cmds::UniformMatrix4fvImmediate>(); - EXPECT_CALL(*gl_, UniformMatrix4fv(_, _, _, _)).Times(0); - SpecializedSetup<cmds::UniformMatrix4fvImmediate, 0>(false); - GLfloat temp[16 * 2] = { - 0, - }; - cmd.Init(1, 2, true, &temp[0]); - EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp))); - EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); -} - TEST_P(GLES2DecoderTest2, UseProgramValidArgs) { EXPECT_CALL(*gl_, UseProgram(kServiceProgramId)); SpecializedSetup<cmds::UseProgram, 0>(true); @@ -1417,36 +577,6 @@ TEST_P(GLES2DecoderTest2, VertexAttrib1fValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, VertexAttrib1fvValidArgs) { - SpecializedSetup<cmds::VertexAttrib1fv, 0>(true); - cmds::VertexAttrib1fv cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - GetSharedMemoryAs<GLfloat*>()[0] = 0; - EXPECT_CALL(*gl_, - VertexAttrib1fv( - 1, reinterpret_cast<const GLfloat*>(shared_memory_address_))); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, VertexAttrib1fvInvalidArgs1_0) { - EXPECT_CALL(*gl_, VertexAttrib1fv(_, _)).Times(0); - SpecializedSetup<cmds::VertexAttrib1fv, 0>(false); - cmds::VertexAttrib1fv cmd; - cmd.Init(1, kInvalidSharedMemoryId, 0); - GetSharedMemoryAs<GLfloat*>()[0] = 0; - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, VertexAttrib1fvInvalidArgs1_1) { - EXPECT_CALL(*gl_, VertexAttrib1fv(_, _)).Times(0); - SpecializedSetup<cmds::VertexAttrib1fv, 0>(false); - cmds::VertexAttrib1fv cmd; - cmd.Init(1, shared_memory_id_, kInvalidSharedMemoryOffset); - GetSharedMemoryAs<GLfloat*>()[0] = 0; - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest2, VertexAttrib1fvImmediateValidArgs) { cmds::VertexAttrib1fvImmediate& cmd = *GetImmediateAs<cmds::VertexAttrib1fvImmediate>(); @@ -1471,36 +601,6 @@ TEST_P(GLES2DecoderTest2, VertexAttrib2fValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, VertexAttrib2fvValidArgs) { - SpecializedSetup<cmds::VertexAttrib2fv, 0>(true); - cmds::VertexAttrib2fv cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - GetSharedMemoryAs<GLfloat*>()[0] = 0; - EXPECT_CALL(*gl_, - VertexAttrib2fv( - 1, reinterpret_cast<const GLfloat*>(shared_memory_address_))); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, VertexAttrib2fvInvalidArgs1_0) { - EXPECT_CALL(*gl_, VertexAttrib2fv(_, _)).Times(0); - SpecializedSetup<cmds::VertexAttrib2fv, 0>(false); - cmds::VertexAttrib2fv cmd; - cmd.Init(1, kInvalidSharedMemoryId, 0); - GetSharedMemoryAs<GLfloat*>()[0] = 0; - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, VertexAttrib2fvInvalidArgs1_1) { - EXPECT_CALL(*gl_, VertexAttrib2fv(_, _)).Times(0); - SpecializedSetup<cmds::VertexAttrib2fv, 0>(false); - cmds::VertexAttrib2fv cmd; - cmd.Init(1, shared_memory_id_, kInvalidSharedMemoryOffset); - GetSharedMemoryAs<GLfloat*>()[0] = 0; - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest2, VertexAttrib2fvImmediateValidArgs) { cmds::VertexAttrib2fvImmediate& cmd = *GetImmediateAs<cmds::VertexAttrib2fvImmediate>(); @@ -1525,36 +625,6 @@ TEST_P(GLES2DecoderTest2, VertexAttrib3fValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, VertexAttrib3fvValidArgs) { - SpecializedSetup<cmds::VertexAttrib3fv, 0>(true); - cmds::VertexAttrib3fv cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - GetSharedMemoryAs<GLfloat*>()[0] = 0; - EXPECT_CALL(*gl_, - VertexAttrib3fv( - 1, reinterpret_cast<const GLfloat*>(shared_memory_address_))); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, VertexAttrib3fvInvalidArgs1_0) { - EXPECT_CALL(*gl_, VertexAttrib3fv(_, _)).Times(0); - SpecializedSetup<cmds::VertexAttrib3fv, 0>(false); - cmds::VertexAttrib3fv cmd; - cmd.Init(1, kInvalidSharedMemoryId, 0); - GetSharedMemoryAs<GLfloat*>()[0] = 0; - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, VertexAttrib3fvInvalidArgs1_1) { - EXPECT_CALL(*gl_, VertexAttrib3fv(_, _)).Times(0); - SpecializedSetup<cmds::VertexAttrib3fv, 0>(false); - cmds::VertexAttrib3fv cmd; - cmd.Init(1, shared_memory_id_, kInvalidSharedMemoryOffset); - GetSharedMemoryAs<GLfloat*>()[0] = 0; - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest2, VertexAttrib3fvImmediateValidArgs) { cmds::VertexAttrib3fvImmediate& cmd = *GetImmediateAs<cmds::VertexAttrib3fvImmediate>(); @@ -1579,36 +649,6 @@ TEST_P(GLES2DecoderTest2, VertexAttrib4fValidArgs) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -TEST_P(GLES2DecoderTest2, VertexAttrib4fvValidArgs) { - SpecializedSetup<cmds::VertexAttrib4fv, 0>(true); - cmds::VertexAttrib4fv cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - GetSharedMemoryAs<GLfloat*>()[0] = 0; - EXPECT_CALL(*gl_, - VertexAttrib4fv( - 1, reinterpret_cast<const GLfloat*>(shared_memory_address_))); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); -} - -TEST_P(GLES2DecoderTest2, VertexAttrib4fvInvalidArgs1_0) { - EXPECT_CALL(*gl_, VertexAttrib4fv(_, _)).Times(0); - SpecializedSetup<cmds::VertexAttrib4fv, 0>(false); - cmds::VertexAttrib4fv cmd; - cmd.Init(1, kInvalidSharedMemoryId, 0); - GetSharedMemoryAs<GLfloat*>()[0] = 0; - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderTest2, VertexAttrib4fvInvalidArgs1_1) { - EXPECT_CALL(*gl_, VertexAttrib4fv(_, _)).Times(0); - SpecializedSetup<cmds::VertexAttrib4fv, 0>(false); - cmds::VertexAttrib4fv cmd; - cmd.Init(1, shared_memory_id_, kInvalidSharedMemoryOffset); - GetSharedMemoryAs<GLfloat*>()[0] = 0; - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderTest2, VertexAttrib4fvImmediateValidArgs) { cmds::VertexAttrib4fvImmediate& cmd = *GetImmediateAs<cmds::VertexAttrib4fvImmediate>(); @@ -1656,9 +696,7 @@ TEST_P(GLES2DecoderTest2, ViewportInvalidArgs3_0) { // TODO(gman): RenderbufferStorageMultisampleEXT // TODO(gman): FramebufferTexture2DMultisampleEXT // TODO(gman): TexStorage2DEXT -// TODO(gman): GenQueriesEXT // TODO(gman): GenQueriesEXTImmediate -// TODO(gman): DeleteQueriesEXT // TODO(gman): DeleteQueriesEXTImmediate // TODO(gman): BeginQueryEXT @@ -1675,9 +713,7 @@ TEST_P(GLES2DecoderTest2, PopGroupMarkerEXTValidArgs) { EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_NO_ERROR, GetGLError()); } -// TODO(gman): GenVertexArraysOES // TODO(gman): GenVertexArraysOESImmediate -// TODO(gman): DeleteVertexArraysOES // TODO(gman): DeleteVertexArraysOESImmediate // TODO(gman): IsVertexArrayOES // TODO(gman): BindVertexArrayOES @@ -1685,4 +721,47 @@ TEST_P(GLES2DecoderTest2, PopGroupMarkerEXTValidArgs) { // TODO(gman): GetMaxValueInBufferCHROMIUM // TODO(gman): GenSharedIdsCHROMIUM +// TODO(gman): DeleteSharedIdsCHROMIUM + +// TODO(gman): RegisterSharedIdsCHROMIUM + +// TODO(gman): EnableFeatureCHROMIUM + +// TODO(gman): ResizeCHROMIUM +// TODO(gman): GetRequestableExtensionsCHROMIUM + +// TODO(gman): RequestExtensionCHROMIUM + +// TODO(gman): GetMultipleIntegervCHROMIUM + +// TODO(gman): GetProgramInfoCHROMIUM + +// TODO(gman): GetTranslatedShaderSourceANGLE +// TODO(gman): PostSubBufferCHROMIUM +// TODO(gman): TexImageIOSurface2DCHROMIUM +// TODO(gman): CopyTextureCHROMIUM +// TODO(gman): DrawArraysInstancedANGLE +// TODO(gman): DrawElementsInstancedANGLE +// TODO(gman): VertexAttribDivisorANGLE +// TODO(gman): GenMailboxCHROMIUM + +// TODO(gman): ProduceTextureCHROMIUMImmediate +// TODO(gman): ConsumeTextureCHROMIUMImmediate +// TODO(gman): BindUniformLocationCHROMIUM + +// TODO(gman): BindUniformLocationCHROMIUMBucket +// TODO(gman): BindTexImage2DCHROMIUM +// TODO(gman): ReleaseTexImage2DCHROMIUM +// TODO(gman): TraceBeginCHROMIUM + +// TODO(gman): TraceEndCHROMIUM +// TODO(gman): AsyncTexSubImage2DCHROMIUM + +// TODO(gman): AsyncTexImage2DCHROMIUM + +// TODO(gman): WaitAsyncTexImage2DCHROMIUM + +// TODO(gman): WaitAllAsyncTexImage2DCHROMIUM + +// TODO(gman): DiscardFramebufferEXTImmediate #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 1fc4e8f20f..1c98b68da6 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 @@ -12,59 +12,11 @@ #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): DeleteSharedIdsCHROMIUM - -// TODO(gman): RegisterSharedIdsCHROMIUM - -// TODO(gman): EnableFeatureCHROMIUM - -// TODO(gman): ResizeCHROMIUM -// TODO(gman): GetRequestableExtensionsCHROMIUM - -// TODO(gman): RequestExtensionCHROMIUM - -// TODO(gman): GetMultipleIntegervCHROMIUM - -// TODO(gman): GetProgramInfoCHROMIUM - -// TODO(gman): GetTranslatedShaderSourceANGLE -// TODO(gman): PostSubBufferCHROMIUM -// TODO(gman): TexImageIOSurface2DCHROMIUM -// TODO(gman): CopyTextureCHROMIUM -// TODO(gman): DrawArraysInstancedANGLE -// TODO(gman): DrawElementsInstancedANGLE -// TODO(gman): VertexAttribDivisorANGLE -// TODO(gman): GenMailboxCHROMIUM - -// TODO(gman): ProduceTextureCHROMIUM -// TODO(gman): ProduceTextureCHROMIUMImmediate -// TODO(gman): ConsumeTextureCHROMIUM -// TODO(gman): ConsumeTextureCHROMIUMImmediate -// TODO(gman): BindUniformLocationCHROMIUM - -// TODO(gman): BindUniformLocationCHROMIUMBucket -// TODO(gman): BindTexImage2DCHROMIUM -// TODO(gman): ReleaseTexImage2DCHROMIUM -// TODO(gman): TraceBeginCHROMIUM - -// TODO(gman): TraceEndCHROMIUM -// TODO(gman): AsyncTexSubImage2DCHROMIUM - -// TODO(gman): AsyncTexImage2DCHROMIUM - -// TODO(gman): WaitAsyncTexImage2DCHROMIUM - -// TODO(gman): WaitAllAsyncTexImage2DCHROMIUM - -// TODO(gman): DiscardFramebufferEXT -// TODO(gman): DiscardFramebufferEXTImmediate // TODO(gman): LoseContextCHROMIUM - // TODO(gman): InsertSyncPointCHROMIUM // TODO(gman): WaitSyncPointCHROMIUM -// TODO(gman): DrawBuffersEXT // TODO(gman): DrawBuffersEXTImmediate // TODO(gman): DiscardBackbufferCHROMIUM diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_async_pixel.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_async_pixel.cc index 445c86fdd1..d32870d9a1 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_async_pixel.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_async_pixel.cc @@ -80,7 +80,6 @@ TEST_P(GLES2DecoderManualInitTest, AsyncPixelTransfers) { GL_RGBA, 8, 8, - 0, GL_RGBA, GL_UNSIGNED_BYTE, kSharedMemoryId, @@ -341,7 +340,6 @@ TEST_P(GLES2DecoderManualInitTest, AsyncPixelTransferManager) { GL_RGBA, 8, 8, - 0, GL_RGBA, GL_UNSIGNED_BYTE, kSharedMemoryId, diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc index cf3ecd0f19..3b000fca37 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_attribs.cc @@ -236,7 +236,6 @@ class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest { virtual void SetUp() { InitState init; - init.extensions = "GL_OES_vertex_array_object"; init.gl_version = "opengl es 2.0"; init.bind_generates_resource = true; InitDecoder(init); @@ -260,25 +259,6 @@ class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest { GLES2DecoderWithShaderTest::TearDown(); } - void GenVertexArraysOESValidArgs() { - AddExpectationsForGenVertexArraysOES(); - GetSharedMemoryAs<GLuint*>()[0] = kNewClientId; - GenVertexArraysOES cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); - EXPECT_TRUE(GetVertexArrayInfo(kNewClientId) != NULL); - AddExpectationsForDeleteVertexArraysOES(); - } - - void GenVertexArraysOESInvalidArgs() { - EXPECT_CALL(*gl_, GenVertexArraysOES(_, _)).Times(0); - GetSharedMemoryAs<GLuint*>()[0] = client_vertexarray_id_; - GenVertexArraysOES cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd)); - } - void GenVertexArraysOESImmediateValidArgs() { AddExpectationsForGenVertexArraysOES(); GenVertexArraysOESImmediate* cmd = @@ -300,24 +280,6 @@ class GLES2DecoderVertexArraysOESTest : public GLES2DecoderWithShaderTest { ExecuteImmediateCmd(*cmd, sizeof(&client_vertexarray_id_))); } - void DeleteVertexArraysOESValidArgs() { - AddExpectationsForDeleteVertexArraysOES(); - GetSharedMemoryAs<GLuint*>()[0] = client_vertexarray_id_; - DeleteVertexArraysOES cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - EXPECT_EQ(GL_NO_ERROR, GetGLError()); - EXPECT_TRUE(GetVertexArrayInfo(client_vertexarray_id_) == NULL); - vertex_array_deleted_manually_ = true; - } - - void DeleteVertexArraysOESInvalidArgs() { - GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId; - DeleteVertexArraysOES cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); - } - void DeleteVertexArraysOESImmediateValidArgs() { AddExpectationsForDeleteVertexArraysOES(); DeleteVertexArraysOESImmediate& cmd = @@ -398,6 +360,7 @@ class GLES2DecoderEmulatedVertexArraysOESTest InitState init; init.gl_version = "3.0"; init.bind_generates_resource = true; + init.use_native_vao = false; InitDecoder(init); SetupDefaultProgram(); @@ -413,20 +376,6 @@ INSTANTIATE_TEST_CASE_P(Service, ::testing::Bool()); // Test vertex array objects with native support -TEST_P(GLES2DecoderVertexArraysOESTest, GenVertexArraysOESValidArgs) { - GenVertexArraysOESValidArgs(); -} -TEST_P(GLES2DecoderEmulatedVertexArraysOESTest, GenVertexArraysOESValidArgs) { - GenVertexArraysOESValidArgs(); -} - -TEST_P(GLES2DecoderVertexArraysOESTest, GenVertexArraysOESInvalidArgs) { - GenVertexArraysOESInvalidArgs(); -} -TEST_P(GLES2DecoderEmulatedVertexArraysOESTest, ) { - GenVertexArraysOESInvalidArgs(); -} - TEST_P(GLES2DecoderVertexArraysOESTest, GenVertexArraysOESImmediateValidArgs) { GenVertexArraysOESImmediateValidArgs(); } @@ -444,22 +393,6 @@ TEST_P(GLES2DecoderEmulatedVertexArraysOESTest, GenVertexArraysOESImmediateInvalidArgs(); } -TEST_P(GLES2DecoderVertexArraysOESTest, DeleteVertexArraysOESValidArgs) { - DeleteVertexArraysOESValidArgs(); -} -TEST_P(GLES2DecoderEmulatedVertexArraysOESTest, - DeleteVertexArraysOESValidArgs) { - DeleteVertexArraysOESValidArgs(); -} - -TEST_P(GLES2DecoderVertexArraysOESTest, DeleteVertexArraysOESInvalidArgs) { - DeleteVertexArraysOESInvalidArgs(); -} -TEST_P(GLES2DecoderEmulatedVertexArraysOESTest, - DeleteVertexArraysOESInvalidArgs) { - DeleteVertexArraysOESInvalidArgs(); -} - TEST_P(GLES2DecoderVertexArraysOESTest, DeleteVertexArraysOESImmediateValidArgs) { DeleteVertexArraysOESImmediateValidArgs(); diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc index 0b829f3fcd..f2a6888a51 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc @@ -27,6 +27,8 @@ using ::gfx::MockGLInterface; using ::testing::_; using ::testing::DoAll; using ::testing::InSequence; +using ::testing::Invoke; +using ::testing::InvokeWithoutArgs; using ::testing::MatcherCast; using ::testing::Pointee; using ::testing::Return; @@ -35,6 +37,45 @@ using ::testing::SetArgPointee; using ::testing::SetArgumentPointee; using ::testing::StrEq; using ::testing::StrictMock; +using ::testing::WithArg; + +namespace { + +void NormalizeInitState(gpu::gles2::GLES2DecoderTestBase::InitState* init) { + CHECK(init); + const char* kVAOExtensions[] = { + "GL_OES_vertex_array_object", + "GL_ARB_vertex_array_object", + "GL_APPLE_vertex_array_object" + }; + bool contains_vao_extension = false; + for (size_t ii = 0; ii < arraysize(kVAOExtensions); ++ii) { + if (init->extensions.find(kVAOExtensions[ii]) != std::string::npos) { + contains_vao_extension = true; + break; + } + } + if (init->use_native_vao) { + if (contains_vao_extension) + return; + if (!init->extensions.empty()) + init->extensions += " "; + if (StartsWithASCII(init->gl_version, "opengl es", false)) { + init->extensions += kVAOExtensions[0]; + } else { +#if !defined(OS_MACOSX) + init->extensions += kVAOExtensions[1]; +#else + init->extensions += kVAOExtensions[2]; +#endif // OS_MACOSX + } + } else { + // Make sure we don't set up an invalid InitState. + CHECK(!contains_vao_extension); + } +} + +} // namespace Anonymous namespace gpu { namespace gles2 { @@ -94,7 +135,8 @@ GLES2DecoderTestBase::InitState::InitState() request_depth(false), request_stencil(false), bind_generates_resource(false), - lose_context_when_out_of_memory(false) { + lose_context_when_out_of_memory(false), + use_native_vao(true) { } void GLES2DecoderTestBase::InitDecoder(const InitState& init) { @@ -104,6 +146,8 @@ void GLES2DecoderTestBase::InitDecoder(const InitState& init) { void GLES2DecoderTestBase::InitDecoderWithCommandLine( const InitState& init, const base::CommandLine* command_line) { + InitState normalized_init = init; + NormalizeInitState(&normalized_init); Framebuffer::ClearFramebufferCompleteComboMap(); gfx::SetGLGetProcAddressProc(gfx::MockGLInterface::GetGLProcAddress); @@ -112,9 +156,11 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine( gl_.reset(new StrictMock<MockGLInterface>()); ::gfx::MockGLInterface::SetGLInterface(gl_.get()); + SetupMockGLBehaviors(); + // Only create stream texture manager if extension is requested. std::vector<std::string> list; - base::SplitString(init.extensions, ' ', &list); + base::SplitString(normalized_init.extensions, ' ', &list); scoped_refptr<FeatureInfo> feature_info; if (command_line) feature_info = new FeatureInfo(*command_line); @@ -124,8 +170,8 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine( memory_tracker_, new ShaderTranslatorCache, feature_info.get(), - init.bind_generates_resource)); - bool use_default_textures = init.bind_generates_resource; + normalized_init.bind_generates_resource)); + bool use_default_textures = normalized_init.bind_generates_resource; InSequence sequence; @@ -136,17 +182,18 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine( // in turn initialize FeatureInfo, which needs a context to determine // extension support. context_ = new gfx::GLContextStubWithExtensions; - context_->AddExtensionsString(init.extensions.c_str()); - context_->SetGLVersionString(init.gl_version.c_str()); + context_->AddExtensionsString(normalized_init.extensions.c_str()); + context_->SetGLVersionString(normalized_init.gl_version.c_str()); context_->MakeCurrent(surface_.get()); gfx::GLSurface::InitializeDynamicMockBindingsForTests(context_); - TestHelper::SetupContextGroupInitExpectations(gl_.get(), - DisallowedFeatures(), - init.extensions.c_str(), - init.gl_version.c_str(), - init.bind_generates_resource); + TestHelper::SetupContextGroupInitExpectations( + gl_.get(), + DisallowedFeatures(), + normalized_init.extensions.c_str(), + normalized_init.gl_version.c_str(), + normalized_init.bind_generates_resource); // We initialize the ContextGroup with a MockGLES2Decoder so that // we can use the ContextGroup to figure out how the real GLES2Decoder @@ -156,7 +203,9 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine( group_->Initialize(mock_decoder_.get(), DisallowedFeatures())); if (group_->feature_info()->feature_flags().native_vertex_array_object) { - EXPECT_CALL(*gl_, GenVertexArraysOES(1, _)).Times(1).RetiresOnSaturation(); + EXPECT_CALL(*gl_, GenVertexArraysOES(1, _)) + .WillOnce(SetArgumentPointee<1>(kServiceVertexArrayId)) + .RetiresOnSaturation(); EXPECT_CALL(*gl_, BindVertexArrayOES(_)).Times(1).RetiresOnSaturation(); } @@ -239,13 +288,13 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine( .Times(1) .RetiresOnSaturation(); EXPECT_CALL(*gl_, GetIntegerv(GL_ALPHA_BITS, _)) - .WillOnce(SetArgumentPointee<1>(init.has_alpha ? 8 : 0)) + .WillOnce(SetArgumentPointee<1>(normalized_init.has_alpha ? 8 : 0)) .RetiresOnSaturation(); EXPECT_CALL(*gl_, GetIntegerv(GL_DEPTH_BITS, _)) - .WillOnce(SetArgumentPointee<1>(init.has_depth ? 24 : 0)) + .WillOnce(SetArgumentPointee<1>(normalized_init.has_depth ? 24 : 0)) .RetiresOnSaturation(); EXPECT_CALL(*gl_, GetIntegerv(GL_STENCIL_BITS, _)) - .WillOnce(SetArgumentPointee<1>(init.has_stencil ? 8 : 0)) + .WillOnce(SetArgumentPointee<1>(normalized_init.has_stencil ? 8 : 0)) .RetiresOnSaturation(); EXPECT_CALL(*gl_, Enable(GL_VERTEX_PROGRAM_POINT_SIZE)) @@ -305,14 +354,15 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine( static const int32 kLoseContextWhenOutOfMemory = 0x10003; - int32 attributes[] = {EGL_ALPHA_SIZE, - init.request_alpha ? 8 : 0, - EGL_DEPTH_SIZE, - init.request_depth ? 24 : 0, - EGL_STENCIL_SIZE, - init.request_stencil ? 8 : 0, - kLoseContextWhenOutOfMemory, - init.lose_context_when_out_of_memory ? 1 : 0, }; + int32 attributes[] = { + EGL_ALPHA_SIZE, + normalized_init.request_alpha ? 8 : 0, + EGL_DEPTH_SIZE, + normalized_init.request_depth ? 24 : 0, + EGL_STENCIL_SIZE, + normalized_init.request_stencil ? 8 : 0, + kLoseContextWhenOutOfMemory, + normalized_init.lose_context_when_out_of_memory ? 1 : 0, }; std::vector<int32> attribs(attributes, attributes + arraysize(attributes)); decoder_.reset(GLES2Decoder::Create(group_.get())); @@ -364,6 +414,11 @@ void GLES2DecoderTestBase::ResetDecoder() { EXPECT_CALL(*gl_, DeleteBuffersARB(1, _)) .Times(2) .RetiresOnSaturation(); + if (group_->feature_info()->feature_flags().native_vertex_array_object) { + EXPECT_CALL(*gl_, DeleteVertexArraysOES(1, Pointee(kServiceVertexArrayId))) + .Times(1) + .RetiresOnSaturation(); + } decoder_->EndDecoding(); decoder_->Destroy(true); @@ -645,10 +700,7 @@ void GLES2DecoderTestBase::DoDeleteBuffer( EXPECT_CALL(*gl_, DeleteBuffersARB(1, Pointee(service_id))) .Times(1) .RetiresOnSaturation(); - cmds::DeleteBuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - memcpy(shared_memory_address_, &client_id, sizeof(client_id)); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + GenHelper<cmds::DeleteBuffersImmediate>(client_id); } void GLES2DecoderTestBase::SetupExpectationsForColorMask(bool red, @@ -840,10 +892,7 @@ void GLES2DecoderTestBase::DoDeleteFramebuffer( EXPECT_CALL(*gl_, DeleteFramebuffersEXT(1, Pointee(service_id))) .Times(1) .RetiresOnSaturation(); - cmds::DeleteFramebuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - memcpy(shared_memory_address_, &client_id, sizeof(client_id)); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + GenHelper<cmds::DeleteFramebuffersImmediate>(client_id); } void GLES2DecoderTestBase::DoBindRenderbuffer( @@ -866,10 +915,7 @@ void GLES2DecoderTestBase::DoDeleteRenderbuffer( EXPECT_CALL(*gl_, DeleteRenderbuffersEXT(1, Pointee(service_id))) .Times(1) .RetiresOnSaturation(); - cmds::DeleteRenderbuffers cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - memcpy(shared_memory_address_, &client_id, sizeof(client_id)); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + GenHelper<cmds::DeleteRenderbuffersImmediate>(client_id); } void GLES2DecoderTestBase::DoBindTexture( @@ -891,10 +937,7 @@ void GLES2DecoderTestBase::DoDeleteTexture( EXPECT_CALL(*gl_, DeleteTextures(1, Pointee(service_id))) .Times(1) .RetiresOnSaturation(); - cmds::DeleteTextures cmd; - cmd.Init(1, shared_memory_id_, shared_memory_offset_); - memcpy(shared_memory_address_, &client_id, sizeof(client_id)); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + GenHelper<cmds::DeleteTexturesImmediate>(client_id); } void GLES2DecoderTestBase::DoTexImage2D( @@ -913,7 +956,7 @@ void GLES2DecoderTestBase::DoTexImage2D( .WillOnce(Return(GL_NO_ERROR)) .RetiresOnSaturation(); cmds::TexImage2D cmd; - cmd.Init(target, level, internal_format, width, height, border, format, + cmd.Init(target, level, internal_format, width, height, format, type, shared_memory_id, shared_memory_offset); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); } @@ -935,7 +978,7 @@ void GLES2DecoderTestBase::DoTexImage2DConvertInternalFormat( .WillOnce(Return(GL_NO_ERROR)) .RetiresOnSaturation(); cmds::TexImage2D cmd; - cmd.Init(target, level, requested_internal_format, width, height, border, + cmd.Init(target, level, requested_internal_format, width, height, format, type, shared_memory_id, shared_memory_offset); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); } @@ -958,7 +1001,7 @@ void GLES2DecoderTestBase::DoCompressedTexImage2D( bucket->SetSize(size); cmds::CompressedTexImage2DBucket cmd; cmd.Init( - target, level, format, width, height, border, + target, level, format, width, height, bucket_id); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); } @@ -996,7 +1039,7 @@ void GLES2DecoderTestBase::DoFramebufferTexture2D( .WillOnce(Return(error)) .RetiresOnSaturation(); cmds::FramebufferTexture2D cmd; - cmd.Init(target, attachment, textarget, texture_client_id, level); + cmd.Init(target, attachment, textarget, texture_client_id); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); } @@ -1495,12 +1538,6 @@ void GLES2DecoderTestBase::AddExpectationsForSimulatedAttrib0WithError( EXPECT_CALL(*gl_, VertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 0, NULL)) .Times(1) .RetiresOnSaturation(); - EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, 0)) - .Times(1) - .RetiresOnSaturation(); - EXPECT_CALL(*gl_, VertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 0, NULL)) - .Times(1) - .RetiresOnSaturation(); EXPECT_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, buffer_id)) .Times(1) .RetiresOnSaturation(); @@ -1513,6 +1550,21 @@ void GLES2DecoderTestBase::AddExpectationsForSimulatedAttrib0( num_vertices, buffer_id, GL_NO_ERROR); } +void GLES2DecoderTestBase::SetupMockGLBehaviors() { + ON_CALL(*gl_, BindVertexArrayOES(_)) + .WillByDefault(Invoke( + &gl_states_, + &GLES2DecoderTestBase::MockGLStates::OnBindVertexArrayOES)); + ON_CALL(*gl_, BindBuffer(GL_ARRAY_BUFFER, _)) + .WillByDefault(WithArg<1>(Invoke( + &gl_states_, + &GLES2DecoderTestBase::MockGLStates::OnBindArrayBuffer))); + ON_CALL(*gl_, VertexAttribPointer(_, _, _, _, _, NULL)) + .WillByDefault(InvokeWithoutArgs( + &gl_states_, + &GLES2DecoderTestBase::MockGLStates::OnVertexAttribNullPointer)); +} + GLES2DecoderWithShaderTestBase::MockCommandBufferEngine:: MockCommandBufferEngine() { diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h index 91ff2e12c8..0107b3ec6d 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h @@ -164,6 +164,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> { bool request_stencil; bool bind_generates_resource; bool lose_context_when_out_of_memory; + bool use_native_vao; // default is true. }; void InitDecoder(const InitState& init); @@ -569,10 +570,47 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> { scoped_refptr<gpu::Buffer> invalid_buffer_; }; + // MockGLStates is used to track GL states and emulate driver + // behaviors on top of MockGLInterface. + class MockGLStates { + public: + MockGLStates() + : bound_array_buffer_object_(0), + bound_vertex_array_object_(0) { + } + + ~MockGLStates() { + } + + void OnBindArrayBuffer(GLuint id) { + bound_array_buffer_object_ = id; + } + + void OnBindVertexArrayOES(GLuint id) { + bound_vertex_array_object_ = id; + } + + void OnVertexAttribNullPointer() { + // When a vertex array object is bound, some drivers (AMD Linux, + // Qualcomm, etc.) have a bug where it incorrectly generates an + // GL_INVALID_OPERATION on glVertexAttribPointer() if pointer + // is NULL, no buffer is bound on GL_ARRAY_BUFFER. + // Make sure we don't trigger this bug. + if (bound_vertex_array_object_ != 0) + EXPECT_TRUE(bound_array_buffer_object_ != 0); + } + + private: + GLuint bound_array_buffer_object_; + GLuint bound_vertex_array_object_; + }; // class MockGLStates + void AddExpectationsForVertexAttribManager(); + void SetupMockGLBehaviors(); scoped_ptr< ::testing::StrictMock<MockCommandBufferEngine> > engine_; scoped_refptr<ContextGroup> group_; + MockGLStates gl_states_; }; class GLES2DecoderWithShaderTestBase : public GLES2DecoderTestBase { @@ -587,6 +625,10 @@ class GLES2DecoderWithShaderTestBase : public GLES2DecoderTestBase { }; +// SpecializedSetup specializations that are needed in multiple unittest files. +template <> +void GLES2DecoderTestBase::SpecializedSetup<cmds::LinkProgram, 0>(bool valid); + } // namespace gles2 } // namespace gpu diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc index b5e680183a..07e31cb367 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_drawing.cc @@ -974,6 +974,22 @@ TEST_P(GLES2DecoderWithShaderTest, DrawArraysInstancedANGLEFails) { EXPECT_EQ(GL_INVALID_OPERATION, GetGLError()); } +TEST_P(GLES2DecoderWithShaderTest, VertexAttribDivisorANGLEFails) { + SetupTexture(); + SetupVertexBuffer(); + DoEnableVertexAttribArray(1); + DoVertexAttribPointer(1, 2, GL_FLOAT, 0, 0); + + EXPECT_CALL(*gl_, VertexAttribDivisorANGLE(_, _)) + .Times(0) + .RetiresOnSaturation(); + + VertexAttribDivisorANGLE cmd; + cmd.Init(0, 1); + EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + EXPECT_EQ(GL_INVALID_OPERATION, GetGLError()); +} + TEST_P(GLES2DecoderGeometryInstancingTest, DrawArraysInstancedANGLENoAttributesFails) { SetupTexture(); diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc index edffc8fc5e..571573add5 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc @@ -122,8 +122,7 @@ TEST_P(GLES2DecoderTest, FramebufferTexture2DWithNoBoundTarget) { cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, - client_texture_id_, - 0); + client_texture_id_); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_INVALID_OPERATION, GetGLError()); } @@ -218,8 +217,7 @@ TEST_P(GLES2DecoderTest, GetFramebufferAttachmentParameterivWithTexture) { fbtex_cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, - client_texture_id_, - 0); + client_texture_id_); cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, @@ -1329,8 +1327,7 @@ TEST_P(GLES2DecoderTest, FramebufferTexture2DGLError) { fbtex_cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, - client_texture_id_, - 0); + client_texture_id_); EXPECT_EQ(error::kNoError, ExecuteCmd(fbtex_cmd)); EXPECT_EQ(GL_OUT_OF_MEMORY, GetGLError()); } @@ -1805,7 +1802,6 @@ TEST_P(GLES2DecoderWithShaderTest, CopyTexImageWithInCompleteFBOFails) { GLenum internal_format = GL_RGBA; GLsizei width = 2; GLsizei height = 4; - GLint border = 0; SetupTexture(); DoBindRenderbuffer( GL_RENDERBUFFER, client_renderbuffer_id_, kServiceRenderbufferId); @@ -1823,7 +1819,7 @@ TEST_P(GLES2DecoderWithShaderTest, CopyTexImageWithInCompleteFBOFails) { .Times(0) .RetiresOnSaturation(); CopyTexImage2D cmd; - cmd.Init(target, level, internal_format, 0, 0, width, height, border); + cmd.Init(target, level, internal_format, 0, 0, width, height); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_INVALID_FRAMEBUFFER_OPERATION, GetGLError()); } @@ -1961,7 +1957,7 @@ void GLES2DecoderWithShaderTest::CheckTextureChangesMarkFBOAsNotComplete( .WillOnce(Return(GL_NO_ERROR)) .RetiresOnSaturation(); CopyTexImage2D cmd; - cmd.Init(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, 1, 1, 0); + cmd.Init(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, 1, 1); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_FALSE(framebuffer_manager->IsComplete(framebuffer)); diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc index 5c0cecf40c..ec7fd48d01 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc @@ -795,32 +795,6 @@ TEST_P(GLES2DecoderWithShaderTest, Uniform1iValidArgs) { EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); } -TEST_P(GLES2DecoderWithShaderTest, Uniform1ivValidArgs) { - EXPECT_CALL( - *gl_, - Uniform1iv(kUniform1RealLocation, - 1, - reinterpret_cast<const GLint*>(shared_memory_address_))); - Uniform1iv cmd; - cmd.Init(kUniform1FakeLocation, 1, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderWithShaderTest, Uniform1ivInvalidArgs2_0) { - EXPECT_CALL(*gl_, Uniform1iv(_, _, _)).Times(0); - Uniform1iv cmd; - cmd.Init(kUniform1FakeLocation, 1, kInvalidSharedMemoryId, 0); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - -TEST_P(GLES2DecoderWithShaderTest, Uniform1ivInvalidArgs2_1) { - EXPECT_CALL(*gl_, Uniform1iv(_, _, _)).Times(0); - Uniform1iv cmd; - cmd.Init( - kUniform1FakeLocation, 1, shared_memory_id_, kInvalidSharedMemoryOffset); - EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd)); -} - TEST_P(GLES2DecoderWithShaderTest, Uniform1ivImmediateValidArgs) { Uniform1ivImmediate& cmd = *GetImmediateAs<Uniform1ivImmediate>(); EXPECT_CALL(*gl_, @@ -834,19 +808,23 @@ TEST_P(GLES2DecoderWithShaderTest, Uniform1ivImmediateValidArgs) { EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp))); } -TEST_P(GLES2DecoderWithShaderTest, Uniform1ivInvalidValidArgs) { +TEST_P(GLES2DecoderWithShaderTest, Uniform1ivImmediateInvalidValidArgs) { EXPECT_CALL(*gl_, Uniform1iv(_, _, _)).Times(0); - Uniform1iv cmd; - cmd.Init(kUniform1FakeLocation, 2, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + Uniform1ivImmediate& cmd = *GetImmediateAs<Uniform1ivImmediate>(); + GLint temp[1 * 2] = { + 0, + }; + cmd.Init(kUniform1FakeLocation, 2, &temp[0]); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp))); EXPECT_EQ(GL_INVALID_OPERATION, GetGLError()); } TEST_P(GLES2DecoderWithShaderTest, Uniform1ivZeroCount) { EXPECT_CALL(*gl_, Uniform1iv(_, _, _)).Times(0); - Uniform1iv cmd; - cmd.Init(kUniform1FakeLocation, 0, shared_memory_id_, shared_memory_offset_); - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); + Uniform1ivImmediate& cmd = *GetImmediateAs<Uniform1ivImmediate>(); + GLint temp = 0; + cmd.Init(kUniform1FakeLocation, 0, &temp); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd, sizeof(temp))); EXPECT_EQ(GL_NO_ERROR, GetGLError()); } diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc index a9af8a1767..5e6a0d4e00 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc @@ -505,7 +505,6 @@ TEST_P(GLES2DecoderTest, TexImage2DRedefinitionSucceeds) { GL_RGBA, kWidth, kHeight, - 0, GL_RGBA, GL_UNSIGNED_BYTE, kSharedMemoryId, @@ -526,7 +525,6 @@ TEST_P(GLES2DecoderTest, TexImage2DRedefinitionSucceeds) { GL_RGBA, kWidth, kHeight, - 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, @@ -601,7 +599,6 @@ TEST_P(GLES2DecoderTest, TexImage2DGLError) { internal_format, width, height, - border, format, type, kSharedMemoryId, @@ -634,7 +631,7 @@ TEST_P(GLES2DecoderTest, CopyTexImage2DGLError) { .Times(1) .RetiresOnSaturation(); CopyTexImage2D cmd; - cmd.Init(target, level, internal_format, 0, 0, width, height, border); + cmd.Init(target, level, internal_format, 0, 0, width, height); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_OUT_OF_MEMORY, GetGLError()); EXPECT_FALSE(texture->GetLevelSize(GL_TEXTURE_2D, level, &width, &height)); @@ -655,7 +652,6 @@ TEST_P(GLES2DecoderManualInitTest, CompressedTexImage2DBucketBadBucket) { GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, 4, 4, - 0, kBadBucketId); EXPECT_NE(error::kNoError, ExecuteCmd(cmd)); CompressedTexSubImage2DBucket cmd2; @@ -715,7 +711,7 @@ TEST_P(GLES2DecoderManualInitTest, CompressedTexImage2DS3TC) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); // test bad width. - cmd.Init(GL_TEXTURE_2D, 0, test.format, 5, 4, 0, kBucketId); + cmd.Init(GL_TEXTURE_2D, 0, test.format, 5, 4, kBucketId); bucket->SetSize(test.block_size * 2); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_INVALID_OPERATION, GetGLError()); @@ -726,7 +722,7 @@ TEST_P(GLES2DecoderManualInitTest, CompressedTexImage2DS3TC) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); // test too bad height. - cmd.Init(GL_TEXTURE_2D, 0, test.format, 4, 5, 0, kBucketId); + cmd.Init(GL_TEXTURE_2D, 0, test.format, 4, 5, kBucketId); bucket->SetSize(test.block_size * 2); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_INVALID_OPERATION, GetGLError()); @@ -742,13 +738,13 @@ TEST_P(GLES2DecoderManualInitTest, CompressedTexImage2DS3TC) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); // test size too large. - cmd.Init(GL_TEXTURE_2D, 0, test.format, 4, 4, 0, kBucketId); + cmd.Init(GL_TEXTURE_2D, 0, test.format, 4, 4, kBucketId); bucket->SetSize(test.block_size * 2); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); // test size too small. - cmd.Init(GL_TEXTURE_2D, 0, test.format, 4, 4, 0, kBucketId); + cmd.Init(GL_TEXTURE_2D, 0, test.format, 4, 4, kBucketId); bucket->SetSize(test.block_size / 2); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); @@ -862,13 +858,13 @@ TEST_P(GLES2DecoderManualInitTest, CompressedTexImage2DETC1) { EXPECT_EQ(GL_NO_ERROR, GetGLError()); // test size too large. - cmd.Init(GL_TEXTURE_2D, 0, kFormat, 4, 4, 0, kBucketId); + cmd.Init(GL_TEXTURE_2D, 0, kFormat, 4, 4, kBucketId); bucket->SetSize(kBlockSize * 2); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); // test size too small. - cmd.Init(GL_TEXTURE_2D, 0, kFormat, 4, 4, 0, kBucketId); + cmd.Init(GL_TEXTURE_2D, 0, kFormat, 4, 4, kBucketId); bucket->SetSize(kBlockSize / 2); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); @@ -1071,7 +1067,6 @@ TEST_P(GLES2DecoderManualInitTest, EGLImageExternalTexImage2DError) { GLenum internal_format = GL_RGBA; GLsizei width = 2; GLsizei height = 4; - GLint border = 0; GLenum format = GL_RGBA; GLenum type = GL_UNSIGNED_BYTE; DoBindTexture(GL_TEXTURE_EXTERNAL_OES, client_texture_id_, kServiceTextureId); @@ -1082,7 +1077,6 @@ TEST_P(GLES2DecoderManualInitTest, EGLImageExternalTexImage2DError) { internal_format, width, height, - border, format, type, kSharedMemoryId, @@ -1210,13 +1204,13 @@ TEST_P(GLES2DecoderManualInitTest, NoDefaultTexParameterfv) { EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1)); EXPECT_EQ(GL_NO_ERROR, GetGLError()); - TexParameterfv cmd2; + GLfloat data = GL_NEAREST; + TexParameterfvImmediate& cmd2 = + *GetImmediateAs<TexParameterfvImmediate>(); cmd2.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, - shared_memory_id_, - shared_memory_offset_); - GetSharedMemoryAs<GLfloat*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2)); + &data); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd2, sizeof(data))); EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); } @@ -1227,13 +1221,13 @@ TEST_P(GLES2DecoderManualInitTest, NoDefaultTexParameterfv) { EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1)); EXPECT_EQ(GL_NO_ERROR, GetGLError()); - TexParameterfv cmd2; + GLfloat data = GL_NEAREST; + TexParameterfvImmediate& cmd2 = + *GetImmediateAs<TexParameterfvImmediate>(); cmd2.Init(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, - shared_memory_id_, - shared_memory_offset_); - GetSharedMemoryAs<GLfloat*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2)); + &data); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd2, sizeof(data))); EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); } } @@ -1250,13 +1244,13 @@ TEST_P(GLES2DecoderManualInitTest, NoDefaultTexParameteriv) { EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1)); EXPECT_EQ(GL_NO_ERROR, GetGLError()); - TexParameteriv cmd2; + GLfloat data = GL_NEAREST; + TexParameterfvImmediate& cmd2 = + *GetImmediateAs<TexParameterfvImmediate>(); cmd2.Init(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, - shared_memory_id_, - shared_memory_offset_); - GetSharedMemoryAs<GLint*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2)); + &data); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd2, sizeof(data))); EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); } @@ -1267,13 +1261,13 @@ TEST_P(GLES2DecoderManualInitTest, NoDefaultTexParameteriv) { EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1)); EXPECT_EQ(GL_NO_ERROR, GetGLError()); - TexParameteriv cmd2; + GLfloat data = GL_NEAREST; + TexParameterfvImmediate& cmd2 = + *GetImmediateAs<TexParameterfvImmediate>(); cmd2.Init(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, - shared_memory_id_, - shared_memory_offset_); - GetSharedMemoryAs<GLint*>()[0] = GL_NEAREST; - EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2)); + &data); + EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(cmd2, sizeof(data))); EXPECT_EQ(GL_INVALID_VALUE, GetGLError()); } } @@ -1295,7 +1289,6 @@ TEST_P(GLES2DecoderManualInitTest, NoDefaultTexImage2D) { GL_RGBA, 2, 2, - 0, GL_RGBA, GL_UNSIGNED_BYTE, kSharedMemoryId, @@ -1491,7 +1484,6 @@ TEST_P(GLES2DecoderManualInitTest, ARBTextureRectangleTexImage2DError) { GLenum internal_format = GL_RGBA; GLsizei width = 2; GLsizei height = 4; - GLint border = 0; GLenum format = GL_RGBA; GLenum type = GL_UNSIGNED_BYTE; DoBindTexture( @@ -1503,7 +1495,6 @@ TEST_P(GLES2DecoderManualInitTest, ARBTextureRectangleTexImage2DError) { internal_format, width, height, - border, format, type, kSharedMemoryId, @@ -1661,7 +1652,6 @@ TEST_P( GL_RGBA, 2, 2, - 0, GL_RGBA, GL_UNSIGNED_BYTE, kSharedMemoryId, @@ -1726,7 +1716,7 @@ TEST_P(GLES2DecoderTest, TexSubImage2DClearsAfterTexImage2DWithDataThenNULL) { // Put in no data. TexImage2D tex_cmd; tex_cmd.Init( - GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, 0); + GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE, 0, 0); // It won't actually call TexImage2D, just mark it as uncleared. EXPECT_EQ(error::kNoError, ExecuteCmd(tex_cmd)); // Next call to TexSubImage2d should clear. @@ -1785,7 +1775,7 @@ TEST_P(GLES2DecoderTest, CopyTexImage2DMarksTextureAsCleared) { .WillOnce(Return(GL_NO_ERROR)) .RetiresOnSaturation(); CopyTexImage2D cmd; - cmd.Init(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, 1, 1, 0); + cmd.Init(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, 1, 1); EXPECT_EQ(error::kNoError, ExecuteCmd(cmd)); EXPECT_TRUE(texture->SafeToRenderFrom()); @@ -1840,7 +1830,6 @@ TEST_P(GLES2DecoderManualInitTest, CompressedImage2DMarksTextureAsCleared) { GL_COMPRESSED_RGB_S3TC_DXT1_EXT, 4, 4, - 0, 8, kSharedMemoryId, kSharedMemoryOffset); @@ -1863,8 +1852,6 @@ TEST_P(GLES2DecoderTest, TextureUsageAngleExtNotEnabledByDefault) { TEST_P(GLES2DecoderTest, ProduceAndConsumeTextureCHROMIUM) { Mailbox mailbox = Mailbox::Generate(); - memcpy(shared_memory_address_, mailbox.name, sizeof(mailbox.name)); - DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId); DoTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 3, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, 0); @@ -1876,9 +1863,11 @@ TEST_P(GLES2DecoderTest, ProduceAndConsumeTextureCHROMIUM) { Texture* texture = texture_ref->texture(); EXPECT_EQ(kServiceTextureId, texture->service_id()); - ProduceTextureCHROMIUM produce_cmd; - produce_cmd.Init(GL_TEXTURE_2D, kSharedMemoryId, kSharedMemoryOffset); - EXPECT_EQ(error::kNoError, ExecuteCmd(produce_cmd)); + ProduceTextureCHROMIUMImmediate& produce_cmd = + *GetImmediateAs<ProduceTextureCHROMIUMImmediate>(); + produce_cmd.Init(GL_TEXTURE_2D, mailbox.name); + EXPECT_EQ(error::kNoError, + ExecuteImmediateCmd(produce_cmd, sizeof(mailbox.name))); EXPECT_EQ(GL_NO_ERROR, GetGLError()); // Texture didn't change. @@ -1916,10 +1905,11 @@ TEST_P(GLES2DecoderTest, ProduceAndConsumeTextureCHROMIUM) { .Times(1) .RetiresOnSaturation(); - memcpy(shared_memory_address_, mailbox.name, sizeof(mailbox.name)); - ConsumeTextureCHROMIUM consume_cmd; - consume_cmd.Init(GL_TEXTURE_2D, kSharedMemoryId, kSharedMemoryOffset); - EXPECT_EQ(error::kNoError, ExecuteCmd(consume_cmd)); + ConsumeTextureCHROMIUMImmediate& consume_cmd = + *GetImmediateAs<ConsumeTextureCHROMIUMImmediate>(); + consume_cmd.Init(GL_TEXTURE_2D, mailbox.name); + EXPECT_EQ(error::kNoError, + ExecuteImmediateCmd(consume_cmd, sizeof(mailbox.name))); EXPECT_EQ(GL_NO_ERROR, GetGLError()); // Texture is redefined. @@ -1960,7 +1950,6 @@ TEST_P(GLES2DecoderManualInitTest, DepthTextureBadArgs) { GL_DEPTH_COMPONENT, 1, 1, - 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, kSharedMemoryId, @@ -1973,7 +1962,6 @@ TEST_P(GLES2DecoderManualInitTest, DepthTextureBadArgs) { GL_DEPTH_COMPONENT, 1, 1, - 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, @@ -2011,7 +1999,7 @@ TEST_P(GLES2DecoderManualInitTest, DepthTextureBadArgs) { // Check that trying to CopyTexImage2D fails CopyTexImage2D copy_tex_cmd; - copy_tex_cmd.Init(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, 0, 0, 1, 1, 0); + copy_tex_cmd.Init(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, 0, 0, 1, 1); EXPECT_EQ(error::kNoError, ExecuteCmd(copy_tex_cmd)); EXPECT_EQ(GL_INVALID_OPERATION, GetGLError()); @@ -2286,8 +2274,7 @@ TEST_P(GLES2DecoderWithShaderTest, UseTexImage) { fbtex_cmd.Init(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, - client_texture_id_, - 0); + client_texture_id_); EXPECT_EQ(error::kNoError, ExecuteCmd(fbtex_cmd)); EXPECT_EQ(GL_NO_ERROR, GetGLError()); diff --git a/gpu/command_buffer/service/gles2_cmd_validation_autogen.h b/gpu/command_buffer/service/gles2_cmd_validation_autogen.h index 06f7afb5a6..cbdf48f79a 100644 --- a/gpu/command_buffer/service/gles2_cmd_validation_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_validation_autogen.h @@ -25,7 +25,6 @@ ValueValidator<GLenum> dst_blend_factor; ValueValidator<GLenum> equation; ValueValidator<GLenum> face_mode; ValueValidator<GLenum> face_type; -ValueValidator<GLboolean> false_only; ValueValidator<GLenum> frame_buffer_parameter; ValueValidator<GLenum> frame_buffer_target; ValueValidator<GLenum> g_l_state; @@ -55,7 +54,6 @@ ValueValidator<GLenum> src_blend_factor; ValueValidator<GLenum> stencil_op; ValueValidator<GLenum> string_type; ValueValidator<GLenum> texture_bind_target; -ValueValidator<GLint> texture_border; ValueValidator<GLenum> texture_format; ValueValidator<GLenum> texture_internal_format; ValueValidator<GLenum> texture_internal_format_storage; @@ -70,6 +68,5 @@ ValueValidator<GLint> vertex_attrib_size; ValueValidator<GLenum> vertex_attrib_type; ValueValidator<GLenum> vertex_attribute; ValueValidator<GLenum> vertex_pointer; -ValueValidator<GLint> zero_only; #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_VALIDATION_AUTOGEN_H_ diff --git a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h index a297112584..e344c30f87 100644 --- a/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h +++ b/gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h @@ -73,10 +73,6 @@ static const GLenum valid_face_type_table[] = { GL_FRONT, GL_BACK, GL_FRONT_AND_BACK, }; -static const GLboolean valid_false_only_table[] = { - false, -}; - static const GLenum valid_frame_buffer_parameter_table[] = { GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, @@ -153,17 +149,10 @@ static const GLenum valid_g_l_state_table[] = { GL_CULL_FACE_MODE, GL_DEPTH_FUNC, GL_DEPTH_WRITEMASK, - GL_DEPTH_RANGE, GL_FRONT_FACE, - GL_GENERATE_MIPMAP_HINT, GL_LINE_WIDTH, - GL_PACK_ALIGNMENT, - GL_UNPACK_ALIGNMENT, GL_POLYGON_OFFSET_FACTOR, GL_POLYGON_OFFSET_UNITS, - GL_SAMPLE_COVERAGE_VALUE, - GL_SAMPLE_COVERAGE_INVERT, - GL_SCISSOR_BOX, GL_STENCIL_FUNC, GL_STENCIL_REF, GL_STENCIL_VALUE_MASK, @@ -178,7 +167,6 @@ static const GLenum valid_g_l_state_table[] = { GL_STENCIL_BACK_FAIL, GL_STENCIL_BACK_PASS_DEPTH_FAIL, GL_STENCIL_BACK_PASS_DEPTH_PASS, - GL_VIEWPORT, GL_BLEND, GL_CULL_FACE, GL_DEPTH_TEST, @@ -323,10 +311,6 @@ static const GLenum valid_texture_bind_target_table[] = { GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP, }; -static const GLint valid_texture_border_table[] = { - 0, -}; - static const GLenum valid_texture_format_table[] = { GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_RGBA, }; @@ -393,10 +377,6 @@ static const GLenum valid_vertex_pointer_table[] = { GL_VERTEX_ATTRIB_ARRAY_POINTER, }; -static const GLint valid_zero_only_table[] = { - 0, -}; - Validators::Validators() : attachment(valid_attachment_table, arraysize(valid_attachment_table)), backbuffer_attachment(valid_backbuffer_attachment_table, @@ -418,7 +398,6 @@ Validators::Validators() equation(valid_equation_table, arraysize(valid_equation_table)), face_mode(valid_face_mode_table, arraysize(valid_face_mode_table)), face_type(valid_face_type_table, arraysize(valid_face_type_table)), - false_only(valid_false_only_table, arraysize(valid_false_only_table)), frame_buffer_parameter(valid_frame_buffer_parameter_table, arraysize(valid_frame_buffer_parameter_table)), frame_buffer_target(valid_frame_buffer_target_table, @@ -467,8 +446,6 @@ Validators::Validators() string_type(valid_string_type_table, arraysize(valid_string_type_table)), texture_bind_target(valid_texture_bind_target_table, arraysize(valid_texture_bind_target_table)), - texture_border(valid_texture_border_table, - arraysize(valid_texture_border_table)), texture_format(valid_texture_format_table, arraysize(valid_texture_format_table)), texture_internal_format(valid_texture_internal_format_table, @@ -497,8 +474,7 @@ Validators::Validators() vertex_attribute(valid_vertex_attribute_table, arraysize(valid_vertex_attribute_table)), vertex_pointer(valid_vertex_pointer_table, - arraysize(valid_vertex_pointer_table)), - zero_only(valid_zero_only_table, arraysize(valid_zero_only_table)) { + arraysize(valid_vertex_pointer_table)) { } #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_VALIDATION_IMPLEMENTATION_AUTOGEN_H_ diff --git a/gpu/command_buffer/service/mocks.h b/gpu/command_buffer/service/mocks.h index 2a95db5f3c..b64305149e 100644 --- a/gpu/command_buffer/service/mocks.h +++ b/gpu/command_buffer/service/mocks.h @@ -93,7 +93,7 @@ class MockShaderTranslator : public ShaderTranslatorInterface { MOCK_CONST_METHOD0(varying_map, const VariableMap&()); MOCK_CONST_METHOD0(name_map, const NameMap&()); MOCK_CONST_METHOD0( - GetStringForOptionsThatWouldEffectCompilation, std::string()); + GetStringForOptionsThatWouldAffectCompilation, std::string()); }; class MockProgramCache : public ProgramCache { diff --git a/gpu/command_buffer/service/program_cache.cc b/gpu/command_buffer/service/program_cache.cc index 6599d4ad3d..ad395c7f47 100644 --- a/gpu/command_buffer/service/program_cache.cc +++ b/gpu/command_buffer/service/program_cache.cc @@ -74,7 +74,7 @@ void ProgramCache::ComputeShaderHash( const ShaderTranslatorInterface* translator, char* result) const { std::string s(( - translator ? translator->GetStringForOptionsThatWouldEffectCompilation() : + translator ? translator->GetStringForOptionsThatWouldAffectCompilation() : std::string()) + str); base::SHA1HashBytes(reinterpret_cast<const unsigned char*>(s.c_str()), s.length(), reinterpret_cast<unsigned char*>(result)); diff --git a/gpu/command_buffer/service/shader_translator.cc b/gpu/command_buffer/service/shader_translator.cc index c3279e25ec..3964c2db16 100644 --- a/gpu/command_buffer/service/shader_translator.cc +++ b/gpu/command_buffer/service/shader_translator.cc @@ -201,9 +201,22 @@ bool ShaderTranslator::Translate(const char* shader) { return success; } -std::string ShaderTranslator::GetStringForOptionsThatWouldEffectCompilation() +std::string ShaderTranslator::GetStringForOptionsThatWouldAffectCompilation() const { +#if ANGLE_SH_VERSION >= 124 + DCHECK(compiler_ != NULL); + + ANGLEGetInfoType resource_len = 0; + ShGetInfo(compiler_, SH_RESOURCES_STRING_LENGTH, &resource_len); + DCHECK(resource_len > 1); + scoped_ptr<char[]> resource_str(new char[resource_len]); + + ShGetBuiltInResourcesString(compiler_, resource_len, resource_str.get()); + return std::string(":CompileOptions:" + + base::IntToString(GetCompileOptions())) + + std::string(resource_str.get()); +#else #if ANGLE_SH_VERSION >= 123 const size_t kNumIntFields = 21; #elif ANGLE_SH_VERSION >= 122 @@ -278,6 +291,7 @@ std::string ShaderTranslator::GetStringForOptionsThatWouldEffectCompilation() #else // ANGLE_SH_VERSION < 122 base::IntToString(compiler_options_.EXT_frag_depth)); #endif +#endif } const char* ShaderTranslator::translated_shader() const { diff --git a/gpu/command_buffer/service/shader_translator.h b/gpu/command_buffer/service/shader_translator.h index b9bacf155e..d993967da9 100644 --- a/gpu/command_buffer/service/shader_translator.h +++ b/gpu/command_buffer/service/shader_translator.h @@ -89,8 +89,8 @@ class ShaderTranslatorInterface { virtual const NameMap& name_map() const = 0; // Return a string that is unique for a specfic set of options that would - // possibly effect compilation. - virtual std::string GetStringForOptionsThatWouldEffectCompilation() const = 0; + // possibly affect compilation. + virtual std::string GetStringForOptionsThatWouldAffectCompilation() const = 0; protected: virtual ~ShaderTranslatorInterface() {} @@ -135,7 +135,7 @@ class GPU_EXPORT ShaderTranslator virtual const VariableMap& varying_map() const OVERRIDE; virtual const NameMap& name_map() const OVERRIDE; - virtual std::string GetStringForOptionsThatWouldEffectCompilation() const + virtual std::string GetStringForOptionsThatWouldAffectCompilation() const OVERRIDE; void AddDestructionObserver(DestructionObserver* observer); diff --git a/gpu/command_buffer/service/shader_translator_unittest.cc b/gpu/command_buffer/service/shader_translator_unittest.cc index 4002c346fd..233b412024 100644 --- a/gpu/command_buffer/service/shader_translator_unittest.cc +++ b/gpu/command_buffer/service/shader_translator_unittest.cc @@ -245,13 +245,13 @@ TEST_F(ShaderTranslatorTest, OptionsString) { SH_EMULATE_BUILT_IN_FUNCTIONS)); std::string options_1( - translator_1->GetStringForOptionsThatWouldEffectCompilation()); + translator_1->GetStringForOptionsThatWouldAffectCompilation()); std::string options_2( - translator_1->GetStringForOptionsThatWouldEffectCompilation()); + translator_1->GetStringForOptionsThatWouldAffectCompilation()); std::string options_3( - translator_2->GetStringForOptionsThatWouldEffectCompilation()); + translator_2->GetStringForOptionsThatWouldAffectCompilation()); std::string options_4( - translator_3->GetStringForOptionsThatWouldEffectCompilation()); + translator_3->GetStringForOptionsThatWouldAffectCompilation()); EXPECT_EQ(options_1, options_2); EXPECT_NE(options_1, options_3); diff --git a/gpu/command_buffer/tests/gl_query_unittest.cc b/gpu/command_buffer/tests/gl_query_unittest.cc index 9a8948fa15..87235e51f6 100644 --- a/gpu/command_buffer/tests/gl_query_unittest.cc +++ b/gpu/command_buffer/tests/gl_query_unittest.cc @@ -150,6 +150,46 @@ TEST_F(QueryTest, DISABLED_LatencyQueryBasic) { EXPECT_LE(query_result, kTimePrecisionMicroseconds); } +TEST_F(QueryTest, CommandsCompleted) { + if (!GLTestHelper::HasExtension("GL_CHROMIUM_sync_query")) { + LOG(INFO) << "GL_CHROMIUM_sync_query not supported. Skipping test..."; + return; + } + + GLuint query; + glGenQueriesEXT(1, &query); + glBeginQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM, query); + glClearColor(0.0, 0.0, 1.0, 1.0); + glClear(GL_COLOR_BUFFER_BIT); + glEndQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM); + glFlush(); + GLuint result = 0; + glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_EXT, &result); + EXPECT_EQ(0u, result); + glDeleteQueriesEXT(1, &query); + GLTestHelper::CheckGLError("no errors", __LINE__); +} + +TEST_F(QueryTest, CommandsCompletedWithFinish) { + if (!GLTestHelper::HasExtension("GL_CHROMIUM_sync_query")) { + LOG(INFO) << "GL_CHROMIUM_sync_query not supported. Skipping test..."; + return; + } + + GLuint query; + glGenQueriesEXT(1, &query); + glBeginQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM, query); + glClearColor(0.0, 0.0, 1.0, 1.0); + glClear(GL_COLOR_BUFFER_BIT); + glEndQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM); + glFinish(); + GLuint result = 0; + glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_AVAILABLE_EXT, &result); + EXPECT_EQ(1u, result); + glDeleteQueriesEXT(1, &query); + GLTestHelper::CheckGLError("no errors", __LINE__); +} + } // namespace gpu diff --git a/gpu/command_buffer_client.target.darwin-arm.mk b/gpu/command_buffer_client.target.darwin-arm.mk index a0b6fadbd9..2397cab168 100644 --- a/gpu/command_buffer_client.target.darwin-arm.mk +++ b/gpu/command_buffer_client.target.darwin-arm.mk @@ -45,7 +45,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -77,12 +84,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -133,7 +145,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -165,12 +184,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_client.target.darwin-arm64.mk b/gpu/command_buffer_client.target.darwin-arm64.mk index f4e5e13f33..9d33379bf9 100644 --- a/gpu/command_buffer_client.target.darwin-arm64.mk +++ b/gpu/command_buffer_client.target.darwin-arm64.mk @@ -74,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -158,12 +163,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_client.target.darwin-mips.mk b/gpu/command_buffer_client.target.darwin-mips.mk index 80379be5ca..f11402f592 100644 --- a/gpu/command_buffer_client.target.darwin-mips.mk +++ b/gpu/command_buffer_client.target.darwin-mips.mk @@ -45,6 +45,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -77,12 +78,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -133,6 +139,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -165,12 +172,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_client.target.darwin-x86.mk b/gpu/command_buffer_client.target.darwin-x86.mk index 7e1e645f17..7d1c922651 100644 --- a/gpu/command_buffer_client.target.darwin-x86.mk +++ b/gpu/command_buffer_client.target.darwin-x86.mk @@ -44,6 +44,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -78,12 +79,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -132,6 +138,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -166,12 +173,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_client.target.darwin-x86_64.mk b/gpu/command_buffer_client.target.darwin-x86_64.mk index 9939fc1195..6e79ae83d3 100644 --- a/gpu/command_buffer_client.target.darwin-x86_64.mk +++ b/gpu/command_buffer_client.target.darwin-x86_64.mk @@ -78,12 +78,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -166,12 +171,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_client.target.linux-arm.mk b/gpu/command_buffer_client.target.linux-arm.mk index a0b6fadbd9..2397cab168 100644 --- a/gpu/command_buffer_client.target.linux-arm.mk +++ b/gpu/command_buffer_client.target.linux-arm.mk @@ -45,7 +45,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -77,12 +84,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -133,7 +145,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -165,12 +184,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_client.target.linux-arm64.mk b/gpu/command_buffer_client.target.linux-arm64.mk index f4e5e13f33..9d33379bf9 100644 --- a/gpu/command_buffer_client.target.linux-arm64.mk +++ b/gpu/command_buffer_client.target.linux-arm64.mk @@ -74,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -158,12 +163,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_client.target.linux-mips.mk b/gpu/command_buffer_client.target.linux-mips.mk index 80379be5ca..f11402f592 100644 --- a/gpu/command_buffer_client.target.linux-mips.mk +++ b/gpu/command_buffer_client.target.linux-mips.mk @@ -45,6 +45,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -77,12 +78,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -133,6 +139,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -165,12 +172,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_client.target.linux-x86.mk b/gpu/command_buffer_client.target.linux-x86.mk index 7e1e645f17..7d1c922651 100644 --- a/gpu/command_buffer_client.target.linux-x86.mk +++ b/gpu/command_buffer_client.target.linux-x86.mk @@ -44,6 +44,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -78,12 +79,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -132,6 +138,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -166,12 +173,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_client.target.linux-x86_64.mk b/gpu/command_buffer_client.target.linux-x86_64.mk index 9939fc1195..6e79ae83d3 100644 --- a/gpu/command_buffer_client.target.linux-x86_64.mk +++ b/gpu/command_buffer_client.target.linux-x86_64.mk @@ -78,12 +78,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -166,12 +171,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_common.target.darwin-arm.mk b/gpu/command_buffer_common.target.darwin-arm.mk index 2b274b6204..805da33d1b 100644 --- a/gpu/command_buffer_common.target.darwin-arm.mk +++ b/gpu/command_buffer_common.target.darwin-arm.mk @@ -48,7 +48,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -80,12 +87,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -136,7 +148,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -168,12 +187,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_common.target.darwin-arm64.mk b/gpu/command_buffer_common.target.darwin-arm64.mk index e31a0d8ccc..7b581ece12 100644 --- a/gpu/command_buffer_common.target.darwin-arm64.mk +++ b/gpu/command_buffer_common.target.darwin-arm64.mk @@ -77,12 +77,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -161,12 +166,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_common.target.darwin-mips.mk b/gpu/command_buffer_common.target.darwin-mips.mk index 82178f36bd..fd9a622b4e 100644 --- a/gpu/command_buffer_common.target.darwin-mips.mk +++ b/gpu/command_buffer_common.target.darwin-mips.mk @@ -48,6 +48,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -80,12 +81,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -136,6 +142,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -168,12 +175,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_common.target.darwin-x86.mk b/gpu/command_buffer_common.target.darwin-x86.mk index 6392a2ee3a..2a8804d167 100644 --- a/gpu/command_buffer_common.target.darwin-x86.mk +++ b/gpu/command_buffer_common.target.darwin-x86.mk @@ -47,6 +47,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -81,12 +82,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -135,6 +141,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -169,12 +176,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_common.target.darwin-x86_64.mk b/gpu/command_buffer_common.target.darwin-x86_64.mk index 8e57eed408..9e52f24667 100644 --- a/gpu/command_buffer_common.target.darwin-x86_64.mk +++ b/gpu/command_buffer_common.target.darwin-x86_64.mk @@ -81,12 +81,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -169,12 +174,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_common.target.linux-arm.mk b/gpu/command_buffer_common.target.linux-arm.mk index 2b274b6204..805da33d1b 100644 --- a/gpu/command_buffer_common.target.linux-arm.mk +++ b/gpu/command_buffer_common.target.linux-arm.mk @@ -48,7 +48,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -80,12 +87,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -136,7 +148,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -168,12 +187,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_common.target.linux-arm64.mk b/gpu/command_buffer_common.target.linux-arm64.mk index e31a0d8ccc..7b581ece12 100644 --- a/gpu/command_buffer_common.target.linux-arm64.mk +++ b/gpu/command_buffer_common.target.linux-arm64.mk @@ -77,12 +77,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -161,12 +166,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_common.target.linux-mips.mk b/gpu/command_buffer_common.target.linux-mips.mk index 82178f36bd..fd9a622b4e 100644 --- a/gpu/command_buffer_common.target.linux-mips.mk +++ b/gpu/command_buffer_common.target.linux-mips.mk @@ -48,6 +48,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -80,12 +81,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -136,6 +142,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -168,12 +175,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_common.target.linux-x86.mk b/gpu/command_buffer_common.target.linux-x86.mk index 6392a2ee3a..2a8804d167 100644 --- a/gpu/command_buffer_common.target.linux-x86.mk +++ b/gpu/command_buffer_common.target.linux-x86.mk @@ -47,6 +47,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -81,12 +82,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -135,6 +141,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -169,12 +176,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_common.target.linux-x86_64.mk b/gpu/command_buffer_common.target.linux-x86_64.mk index 8e57eed408..9e52f24667 100644 --- a/gpu/command_buffer_common.target.linux-x86_64.mk +++ b/gpu/command_buffer_common.target.linux-x86_64.mk @@ -81,12 +81,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -169,12 +174,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/command_buffer_service.target.darwin-arm.mk b/gpu/command_buffer_service.target.darwin-arm.mk index 40e79af76f..a44492d0f3 100644 --- a/gpu/command_buffer_service.target.darwin-arm.mk +++ b/gpu/command_buffer_service.target.darwin-arm.mk @@ -90,7 +90,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -122,12 +129,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -139,10 +151,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -220,7 +234,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -253,12 +274,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -270,10 +296,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/command_buffer_service.target.darwin-arm64.mk b/gpu/command_buffer_service.target.darwin-arm64.mk index 976507e0bf..04a534ffbe 100644 --- a/gpu/command_buffer_service.target.darwin-arm64.mk +++ b/gpu/command_buffer_service.target.darwin-arm64.mk @@ -119,12 +119,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -136,10 +141,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -246,12 +253,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -263,10 +275,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/command_buffer_service.target.darwin-mips.mk b/gpu/command_buffer_service.target.darwin-mips.mk index 4f79026814..8a81b8c065 100644 --- a/gpu/command_buffer_service.target.darwin-mips.mk +++ b/gpu/command_buffer_service.target.darwin-mips.mk @@ -90,6 +90,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -122,12 +123,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -139,10 +145,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -220,6 +228,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -253,12 +262,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -270,10 +284,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/command_buffer_service.target.darwin-x86.mk b/gpu/command_buffer_service.target.darwin-x86.mk index 011028bffc..3695ae7ca8 100644 --- a/gpu/command_buffer_service.target.darwin-x86.mk +++ b/gpu/command_buffer_service.target.darwin-x86.mk @@ -89,6 +89,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -123,12 +124,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -140,10 +146,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -219,6 +227,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -254,12 +263,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -271,10 +285,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/command_buffer_service.target.darwin-x86_64.mk b/gpu/command_buffer_service.target.darwin-x86_64.mk index c8f4a44b6c..408c56a37d 100644 --- a/gpu/command_buffer_service.target.darwin-x86_64.mk +++ b/gpu/command_buffer_service.target.darwin-x86_64.mk @@ -123,12 +123,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -140,10 +145,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -254,12 +261,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -271,10 +283,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/command_buffer_service.target.linux-arm.mk b/gpu/command_buffer_service.target.linux-arm.mk index 40e79af76f..a44492d0f3 100644 --- a/gpu/command_buffer_service.target.linux-arm.mk +++ b/gpu/command_buffer_service.target.linux-arm.mk @@ -90,7 +90,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -122,12 +129,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -139,10 +151,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -220,7 +234,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -253,12 +274,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -270,10 +296,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/command_buffer_service.target.linux-arm64.mk b/gpu/command_buffer_service.target.linux-arm64.mk index 976507e0bf..04a534ffbe 100644 --- a/gpu/command_buffer_service.target.linux-arm64.mk +++ b/gpu/command_buffer_service.target.linux-arm64.mk @@ -119,12 +119,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -136,10 +141,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -246,12 +253,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -263,10 +275,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/command_buffer_service.target.linux-mips.mk b/gpu/command_buffer_service.target.linux-mips.mk index 4f79026814..8a81b8c065 100644 --- a/gpu/command_buffer_service.target.linux-mips.mk +++ b/gpu/command_buffer_service.target.linux-mips.mk @@ -90,6 +90,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -122,12 +123,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -139,10 +145,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -220,6 +228,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -253,12 +262,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -270,10 +284,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/command_buffer_service.target.linux-x86.mk b/gpu/command_buffer_service.target.linux-x86.mk index 011028bffc..3695ae7ca8 100644 --- a/gpu/command_buffer_service.target.linux-x86.mk +++ b/gpu/command_buffer_service.target.linux-x86.mk @@ -89,6 +89,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -123,12 +124,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -140,10 +146,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -219,6 +227,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -254,12 +263,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -271,10 +285,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/command_buffer_service.target.linux-x86_64.mk b/gpu/command_buffer_service.target.linux-x86_64.mk index c8f4a44b6c..408c56a37d 100644 --- a/gpu/command_buffer_service.target.linux-x86_64.mk +++ b/gpu/command_buffer_service.target.linux-x86_64.mk @@ -123,12 +123,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -140,10 +145,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -254,12 +261,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -271,10 +283,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/config/BUILD.gn b/gpu/config/BUILD.gn new file mode 100644 index 0000000000..9ace1237a3 --- /dev/null +++ b/gpu/config/BUILD.gn @@ -0,0 +1,69 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ui.gni") + +source_set("config") { + sources = [ + "dx_diag_node.cc", + "dx_diag_node.h", + "gpu_blacklist.cc", + "gpu_blacklist.h", + "gpu_control_list_jsons.h", + "gpu_control_list.cc", + "gpu_control_list.h", + "gpu_driver_bug_list_json.cc", + "gpu_driver_bug_list.cc", + "gpu_driver_bug_list.h", + "gpu_driver_bug_workaround_type.h", + "gpu_dx_diagnostics_win.cc", + "gpu_feature_type.h", + "gpu_info.cc", + "gpu_info.h", + "gpu_info_collector_android.cc", + "gpu_info_collector_mac.mm", + "gpu_info_collector_ozone.cc", + "gpu_info_collector_win.cc", + "gpu_info_collector_x11.cc", + "gpu_info_collector.cc", + "gpu_info_collector.h", + "gpu_performance_stats.h", + "gpu_test_config.cc", + "gpu_test_config.h", + "gpu_test_expectations_parser.cc", + "gpu_test_expectations_parser.h", + "gpu_util.cc", + "gpu_util.h", + "software_rendering_list_json.cc", + ] + + deps = [ + "//base", + "//third_party/re2", + "//ui/gl", + ] + + if (is_win) { + deps += [ "//third_party/libxml" ] + libs = [ "dxguid.lib", "setupapi.lib" ] + + if (is_chrome_branded) { + sources += [ + "//third_party/amd/AmdCfxPxExt.h", + "//third_party/amd/amd_videocard_info_win.cc", + ] + } + } + if (is_linux && use_x11) { + configs += [ + "//build/config/linux:x11", + "//build/config/linux:xext", + ] + deps += [ + "//build/config/linux:libpci", + "//third_party/libXNVCtrl", + ] + } +} + diff --git a/gpu/config/gpu_driver_bug_list_json.cc b/gpu/config/gpu_driver_bug_list_json.cc index bf699f6cf4..f0478ad965 100644 --- a/gpu/config/gpu_driver_bug_list_json.cc +++ b/gpu/config/gpu_driver_bug_list_json.cc @@ -19,7 +19,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST( { "name": "gpu driver bug list", // Please update the version number whenever you change this file. - "version": "5.3", + "version": "5.8", "entries": [ { "id": 1, @@ -397,21 +397,6 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST( ] }, { - "id": 29, - "cr_bugs": [278606], - "description": "Testing fences is broken on Qualcomm.", - "os": { - "type": "android" - }, - "gl_vendor": { - "op": "beginwith", - "value": "Qualcomm" - }, - "features": [ - "disable_async_readpixels" - ] - }, - { "id": 30, "cr_bugs": [237931], "description": "Multisampling is buggy on OSX when multiple monitors are connected", @@ -967,6 +952,112 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST( "features": [ "use_virtualized_gl_contexts" ] + }, + { + "id": 73, + "description": "Using D3D11 causes browser crashes on certain Intel GPUs", + "cr_bugs": [310808], + "os": { + "type": "win" + }, + "vendor_id": "0x8086", + "features": [ + "disable_d3d11" + ] + }, +) // LONG_STRING_CONST macro +// Avoid C2026 (string too big) error on VisualStudio. +LONG_STRING_CONST( + { + "id": 74, + "cr_bugs": [278606], + "description": "Testing EGL sync fences is broken on Qualcomm before Android 4.4", + "os": { + "type": "android", + "version": { + "op": "<", + "value": "4.4" + } + }, + "gl_vendor": { + "op": "beginwith", + "value": "Qualcomm" + }, + "features": [ + "disable_egl_khr_fence_sync" + ] + }, + { + "id": 75, + "description": "Mali-400 support of EXT_multisampled_render_to_texture is buggy on Android < 4.3", + "cr_bugs": [362435], + "os": { + "type": "android", + "version": { + "op": "<", + "value": "4.3" + } + }, + "gl_vendor": { + "op": "beginwith", + "value": "ARM" + }, + "gl_renderer": { + "op": "contains", + "value": "Mali-400" + }, + "features": [ + "disable_multisampling" + ] + }, + { + "id": 76, + "cr_bugs": [371530], + "description": "Testing EGL sync fences is broken on IMG", + "os": { + "type": "android" + }, + "gl_vendor": { + "op": "beginwith", + "value": "Imagination Technologies" + }, + "features": [ + "disable_egl_khr_fence_sync" + ] + }, + { + "id": 77, + "cr_bugs": [378691, 373360, 371530], + "description": "Testing fences is broken on Mali-400 MP drivers", + "os": { + "type": "android" + }, + "gl_vendor": { + "op": "beginwith", + "value": "ARM" + }, + "gl_renderer": { + "op": "beginwith", + "value": "Mali-400 MP" + }, + "features": [ + "disable_egl_khr_fence_sync" + ] + }, + { + "id": 78, + "cr_bugs": [378691, 373360, 371530], + "description": "Testing fences is broken on Broadcom drivers", + "os": { + "type": "android" + }, + "gl_vendor": { + "op": "beginwith", + "value": "Broadcom" + }, + "features": [ + "disable_egl_khr_fence_sync" + ] } ] } diff --git a/gpu/config/gpu_driver_bug_workaround_type.h b/gpu/config/gpu_driver_bug_workaround_type.h index 06fa15b27c..796ca1390e 100644 --- a/gpu/config/gpu_driver_bug_workaround_type.h +++ b/gpu/config/gpu_driver_bug_workaround_type.h @@ -24,6 +24,8 @@ disable_d3d11) \ GPU_OP(DISABLE_DEPTH_TEXTURE, \ disable_depth_texture) \ + GPU_OP(DISABLE_EGL_KHR_FENCE_SYNC, \ + disable_egl_khr_fence_sync) \ GPU_OP(DISABLE_EXT_DISCARD_FRAMEBUFFER, \ disable_ext_discard_framebuffer) \ GPU_OP(DISABLE_EXT_DRAW_BUFFERS, \ diff --git a/gpu/config/gpu_info_collector.cc b/gpu/config/gpu_info_collector.cc index e464a9646e..5d7dd5a9c2 100644 --- a/gpu/config/gpu_info_collector.cc +++ b/gpu/config/gpu_info_collector.cc @@ -22,7 +22,7 @@ namespace { scoped_refptr<gfx::GLSurface> InitializeGLSurface() { scoped_refptr<gfx::GLSurface> surface( - gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1))); + gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size())); if (!surface.get()) { LOG(ERROR) << "gfx::GLContext::CreateOffscreenGLSurface failed"; return NULL; diff --git a/gpu/config/gpu_info_collector_win.cc b/gpu/config/gpu_info_collector_win.cc index 73d5423aad..556842c3e8 100644 --- a/gpu/config/gpu_info_collector_win.cc +++ b/gpu/config/gpu_info_collector_win.cc @@ -545,7 +545,8 @@ GpuIDResult CollectGpuID(uint32* vendor_id, uint32* device_id) { base::HexStringToInt(base::UTF16ToASCII(device_string), &device); *vendor_id = vendor; *device_id = device; - return kGpuIDSuccess; + if (*vendor_id != 0 && *device_id != 0) + return kGpuIDSuccess; } return kGpuIDFailure; } diff --git a/gpu/config/gpu_info_collector_x11.cc b/gpu/config/gpu_info_collector_x11.cc index d4288b7793..5d29d384cd 100644 --- a/gpu/config/gpu_info_collector_x11.cc +++ b/gpu/config/gpu_info_collector_x11.cc @@ -208,7 +208,8 @@ GpuIDResult CollectGpuID(uint32* vendor_id, uint32* device_id) { if (CollectPCIVideoCardInfo(&gpu_info)) { *vendor_id = gpu_info.gpu.vendor_id; *device_id = gpu_info.gpu.device_id; - return kGpuIDSuccess; + if (*vendor_id != 0 && *device_id != 0) + return kGpuIDSuccess; } return kGpuIDFailure; } @@ -237,13 +238,18 @@ CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) { case kVendorIDIntel: // In dual-GPU cases, sometimes PCI scan only gives us the // integrated GPU (i.e., the Intel one). - driver_version = CollectDriverVersionNVidia(); - if (!driver_version.empty()) { - gpu_info->driver_vendor = "NVIDIA"; - gpu_info->driver_version = driver_version; - // Machines with more than two GPUs are not handled. - if (gpu_info->secondary_gpus.size() <= 1) + if (gpu_info->secondary_gpus.size() == 0) { + driver_version = CollectDriverVersionNVidia(); + if (!driver_version.empty()) { + gpu_info->driver_vendor = "NVIDIA"; + gpu_info->driver_version = driver_version; gpu_info->optimus = true; + // Put Intel to the secondary GPU list. + gpu_info->secondary_gpus.push_back(gpu_info->gpu); + // Put NVIDIA as the primary GPU. + gpu_info->gpu.vendor_id = kVendorIDNVidia; + gpu_info->gpu.device_id = 0; // Unknown Device. + } } break; } diff --git a/gpu/config/gpu_test_config.cc b/gpu/config/gpu_test_config.cc index 944a3e2063..e3d489c25f 100644 --- a/gpu/config/gpu_test_config.cc +++ b/gpu/config/gpu_test_config.cc @@ -37,7 +37,7 @@ GPUTestConfig::OS GetCurrentOS() { return GPUTestConfig::kOsWinVista; if (major_version == 6 && minor_version == 1) return GPUTestConfig::kOsWin7; - if (major_version == 6 && minor_version == 2) + if (major_version == 6 && (minor_version == 2 || minor_version == 3)) return GPUTestConfig::kOsWin8; #elif defined(OS_MACOSX) int32 major_version = 0; @@ -237,6 +237,7 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo* gpu_info) { result = CollectGpuID(&my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id); if (result == kGpuIDNotSupported) { + LOG(ERROR) << "Fail to identify GPU"; DisableGPUInfoValidation(); rt = true; } else { @@ -246,8 +247,10 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo* gpu_info) { rt = SetGPUInfo(*gpu_info); } set_os(GetCurrentOS()); - if (os() == kOsUnknown) + if (os() == kOsUnknown) { + LOG(ERROR) << "Unknown OS"; rt = false; + } #if defined(NDEBUG) set_build_type(kBuildTypeRelease); #else diff --git a/gpu/disk_cache_proto.target.darwin-arm.mk b/gpu/disk_cache_proto.target.darwin-arm.mk index 8f37aef30e..0d7d02ab8b 100644 --- a/gpu/disk_cache_proto.target.darwin-arm.mk +++ b/gpu/disk_cache_proto.target.darwin-arm.mk @@ -64,7 +64,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -96,12 +103,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -155,7 +167,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -187,12 +206,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ diff --git a/gpu/disk_cache_proto.target.darwin-arm64.mk b/gpu/disk_cache_proto.target.darwin-arm64.mk index 56167a48c7..3502376ce8 100644 --- a/gpu/disk_cache_proto.target.darwin-arm64.mk +++ b/gpu/disk_cache_proto.target.darwin-arm64.mk @@ -93,12 +93,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -180,12 +185,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ diff --git a/gpu/disk_cache_proto.target.darwin-mips.mk b/gpu/disk_cache_proto.target.darwin-mips.mk index 379a9d4974..c6dd05993f 100644 --- a/gpu/disk_cache_proto.target.darwin-mips.mk +++ b/gpu/disk_cache_proto.target.darwin-mips.mk @@ -64,6 +64,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -96,12 +97,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -155,6 +161,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -187,12 +194,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ diff --git a/gpu/disk_cache_proto.target.darwin-x86.mk b/gpu/disk_cache_proto.target.darwin-x86.mk index a9046c90c7..78c5716edc 100644 --- a/gpu/disk_cache_proto.target.darwin-x86.mk +++ b/gpu/disk_cache_proto.target.darwin-x86.mk @@ -63,6 +63,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -97,12 +98,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -154,6 +160,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -188,12 +195,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ diff --git a/gpu/disk_cache_proto.target.darwin-x86_64.mk b/gpu/disk_cache_proto.target.darwin-x86_64.mk index 372ce6060b..5b82cc9c65 100644 --- a/gpu/disk_cache_proto.target.darwin-x86_64.mk +++ b/gpu/disk_cache_proto.target.darwin-x86_64.mk @@ -97,12 +97,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -188,12 +193,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ diff --git a/gpu/disk_cache_proto.target.linux-arm.mk b/gpu/disk_cache_proto.target.linux-arm.mk index 8f37aef30e..0d7d02ab8b 100644 --- a/gpu/disk_cache_proto.target.linux-arm.mk +++ b/gpu/disk_cache_proto.target.linux-arm.mk @@ -64,7 +64,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -96,12 +103,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -155,7 +167,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -187,12 +206,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ diff --git a/gpu/disk_cache_proto.target.linux-arm64.mk b/gpu/disk_cache_proto.target.linux-arm64.mk index 56167a48c7..3502376ce8 100644 --- a/gpu/disk_cache_proto.target.linux-arm64.mk +++ b/gpu/disk_cache_proto.target.linux-arm64.mk @@ -93,12 +93,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -180,12 +185,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ diff --git a/gpu/disk_cache_proto.target.linux-mips.mk b/gpu/disk_cache_proto.target.linux-mips.mk index 379a9d4974..c6dd05993f 100644 --- a/gpu/disk_cache_proto.target.linux-mips.mk +++ b/gpu/disk_cache_proto.target.linux-mips.mk @@ -64,6 +64,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -96,12 +97,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -155,6 +161,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -187,12 +194,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ diff --git a/gpu/disk_cache_proto.target.linux-x86.mk b/gpu/disk_cache_proto.target.linux-x86.mk index a9046c90c7..78c5716edc 100644 --- a/gpu/disk_cache_proto.target.linux-x86.mk +++ b/gpu/disk_cache_proto.target.linux-x86.mk @@ -63,6 +63,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -97,12 +98,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -154,6 +160,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -188,12 +195,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ diff --git a/gpu/disk_cache_proto.target.linux-x86_64.mk b/gpu/disk_cache_proto.target.linux-x86_64.mk index 372ce6060b..5b82cc9c65 100644 --- a/gpu/disk_cache_proto.target.linux-x86_64.mk +++ b/gpu/disk_cache_proto.target.linux-x86_64.mk @@ -97,12 +97,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -188,12 +193,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ diff --git a/gpu/gl_in_process_context.target.darwin-arm.mk b/gpu/gl_in_process_context.target.darwin-arm.mk index 83d690c45c..6bfcb9c9fb 100644 --- a/gpu/gl_in_process_context.target.darwin-arm.mk +++ b/gpu/gl_in_process_context.target.darwin-arm.mk @@ -42,7 +42,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -74,12 +81,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -137,7 +149,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -169,12 +188,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gl_in_process_context.target.darwin-arm64.mk b/gpu/gl_in_process_context.target.darwin-arm64.mk index 769e337c52..bc3433a241 100644 --- a/gpu/gl_in_process_context.target.darwin-arm64.mk +++ b/gpu/gl_in_process_context.target.darwin-arm64.mk @@ -71,12 +71,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -162,12 +167,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gl_in_process_context.target.darwin-mips.mk b/gpu/gl_in_process_context.target.darwin-mips.mk index 2b1ec0a124..969ca9c479 100644 --- a/gpu/gl_in_process_context.target.darwin-mips.mk +++ b/gpu/gl_in_process_context.target.darwin-mips.mk @@ -42,6 +42,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -74,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -137,6 +143,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -169,12 +176,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gl_in_process_context.target.darwin-x86.mk b/gpu/gl_in_process_context.target.darwin-x86.mk index 897b0d6d74..789bdbb1eb 100644 --- a/gpu/gl_in_process_context.target.darwin-x86.mk +++ b/gpu/gl_in_process_context.target.darwin-x86.mk @@ -41,6 +41,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -75,12 +76,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -136,6 +142,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -170,12 +177,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gl_in_process_context.target.darwin-x86_64.mk b/gpu/gl_in_process_context.target.darwin-x86_64.mk index d6bda61637..6c6524a1d8 100644 --- a/gpu/gl_in_process_context.target.darwin-x86_64.mk +++ b/gpu/gl_in_process_context.target.darwin-x86_64.mk @@ -75,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -170,12 +175,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gl_in_process_context.target.linux-arm.mk b/gpu/gl_in_process_context.target.linux-arm.mk index 83d690c45c..6bfcb9c9fb 100644 --- a/gpu/gl_in_process_context.target.linux-arm.mk +++ b/gpu/gl_in_process_context.target.linux-arm.mk @@ -42,7 +42,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -74,12 +81,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -137,7 +149,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -169,12 +188,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gl_in_process_context.target.linux-arm64.mk b/gpu/gl_in_process_context.target.linux-arm64.mk index 769e337c52..bc3433a241 100644 --- a/gpu/gl_in_process_context.target.linux-arm64.mk +++ b/gpu/gl_in_process_context.target.linux-arm64.mk @@ -71,12 +71,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -162,12 +167,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gl_in_process_context.target.linux-mips.mk b/gpu/gl_in_process_context.target.linux-mips.mk index 2b1ec0a124..969ca9c479 100644 --- a/gpu/gl_in_process_context.target.linux-mips.mk +++ b/gpu/gl_in_process_context.target.linux-mips.mk @@ -42,6 +42,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -74,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -137,6 +143,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -169,12 +176,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gl_in_process_context.target.linux-x86.mk b/gpu/gl_in_process_context.target.linux-x86.mk index 897b0d6d74..789bdbb1eb 100644 --- a/gpu/gl_in_process_context.target.linux-x86.mk +++ b/gpu/gl_in_process_context.target.linux-x86.mk @@ -41,6 +41,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -75,12 +76,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -136,6 +142,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -170,12 +177,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gl_in_process_context.target.linux-x86_64.mk b/gpu/gl_in_process_context.target.linux-x86_64.mk index d6bda61637..6c6524a1d8 100644 --- a/gpu/gl_in_process_context.target.linux-x86_64.mk +++ b/gpu/gl_in_process_context.target.linux-x86_64.mk @@ -75,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -170,12 +175,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGL_IN_PROCESS_CONTEXT_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gles2_c_lib.target.darwin-arm.mk b/gpu/gles2_c_lib.target.darwin-arm.mk index 201acc6697..4eae57b53c 100644 --- a/gpu/gles2_c_lib.target.darwin-arm.mk +++ b/gpu/gles2_c_lib.target.darwin-arm.mk @@ -41,7 +41,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -73,12 +80,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ @@ -133,7 +145,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -165,12 +184,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gles2_c_lib.target.darwin-arm64.mk b/gpu/gles2_c_lib.target.darwin-arm64.mk index ff096f6822..8213cf9384 100644 --- a/gpu/gles2_c_lib.target.darwin-arm64.mk +++ b/gpu/gles2_c_lib.target.darwin-arm64.mk @@ -70,12 +70,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ @@ -158,12 +163,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gles2_c_lib.target.darwin-mips.mk b/gpu/gles2_c_lib.target.darwin-mips.mk index 6c857e0cf1..81fcf73056 100644 --- a/gpu/gles2_c_lib.target.darwin-mips.mk +++ b/gpu/gles2_c_lib.target.darwin-mips.mk @@ -41,6 +41,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -73,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ @@ -133,6 +139,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -165,12 +172,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gles2_c_lib.target.darwin-x86.mk b/gpu/gles2_c_lib.target.darwin-x86.mk index 87b8edfd1d..9de84e0d4d 100644 --- a/gpu/gles2_c_lib.target.darwin-x86.mk +++ b/gpu/gles2_c_lib.target.darwin-x86.mk @@ -40,6 +40,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -74,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ @@ -132,6 +138,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -166,12 +173,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gles2_c_lib.target.darwin-x86_64.mk b/gpu/gles2_c_lib.target.darwin-x86_64.mk index e8a067a367..ae07b04589 100644 --- a/gpu/gles2_c_lib.target.darwin-x86_64.mk +++ b/gpu/gles2_c_lib.target.darwin-x86_64.mk @@ -74,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ @@ -166,12 +171,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gles2_c_lib.target.linux-arm.mk b/gpu/gles2_c_lib.target.linux-arm.mk index 201acc6697..4eae57b53c 100644 --- a/gpu/gles2_c_lib.target.linux-arm.mk +++ b/gpu/gles2_c_lib.target.linux-arm.mk @@ -41,7 +41,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -73,12 +80,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ @@ -133,7 +145,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -165,12 +184,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gles2_c_lib.target.linux-arm64.mk b/gpu/gles2_c_lib.target.linux-arm64.mk index ff096f6822..8213cf9384 100644 --- a/gpu/gles2_c_lib.target.linux-arm64.mk +++ b/gpu/gles2_c_lib.target.linux-arm64.mk @@ -70,12 +70,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ @@ -158,12 +163,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gles2_c_lib.target.linux-mips.mk b/gpu/gles2_c_lib.target.linux-mips.mk index 6c857e0cf1..81fcf73056 100644 --- a/gpu/gles2_c_lib.target.linux-mips.mk +++ b/gpu/gles2_c_lib.target.linux-mips.mk @@ -41,6 +41,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -73,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ @@ -133,6 +139,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -165,12 +172,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gles2_c_lib.target.linux-x86.mk b/gpu/gles2_c_lib.target.linux-x86.mk index 87b8edfd1d..9de84e0d4d 100644 --- a/gpu/gles2_c_lib.target.linux-x86.mk +++ b/gpu/gles2_c_lib.target.linux-x86.mk @@ -40,6 +40,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -74,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ @@ -132,6 +138,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -166,12 +173,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gles2_c_lib.target.linux-x86_64.mk b/gpu/gles2_c_lib.target.linux-x86_64.mk index e8a067a367..ae07b04589 100644 --- a/gpu/gles2_c_lib.target.linux-x86_64.mk +++ b/gpu/gles2_c_lib.target.linux-x86_64.mk @@ -74,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ @@ -166,12 +171,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_C_LIB_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gles2_cmd_helper.target.darwin-arm.mk b/gpu/gles2_cmd_helper.target.darwin-arm.mk index 5f42c382a5..c569baf7fc 100644 --- a/gpu/gles2_cmd_helper.target.darwin-arm.mk +++ b/gpu/gles2_cmd_helper.target.darwin-arm.mk @@ -40,7 +40,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -72,12 +79,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -128,7 +140,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -160,12 +179,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gles2_cmd_helper.target.darwin-arm64.mk b/gpu/gles2_cmd_helper.target.darwin-arm64.mk index 5e9d5e2222..f2a1f6d4dd 100644 --- a/gpu/gles2_cmd_helper.target.darwin-arm64.mk +++ b/gpu/gles2_cmd_helper.target.darwin-arm64.mk @@ -69,12 +69,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -153,12 +158,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gles2_cmd_helper.target.darwin-mips.mk b/gpu/gles2_cmd_helper.target.darwin-mips.mk index e6310144ff..f4c6e16621 100644 --- a/gpu/gles2_cmd_helper.target.darwin-mips.mk +++ b/gpu/gles2_cmd_helper.target.darwin-mips.mk @@ -40,6 +40,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -72,12 +73,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -128,6 +134,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -160,12 +167,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gles2_cmd_helper.target.darwin-x86.mk b/gpu/gles2_cmd_helper.target.darwin-x86.mk index 5cb68b45a3..83e4d4f819 100644 --- a/gpu/gles2_cmd_helper.target.darwin-x86.mk +++ b/gpu/gles2_cmd_helper.target.darwin-x86.mk @@ -39,6 +39,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -73,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -127,6 +133,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -161,12 +168,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gles2_cmd_helper.target.darwin-x86_64.mk b/gpu/gles2_cmd_helper.target.darwin-x86_64.mk index bc494f89d2..aca51c9886 100644 --- a/gpu/gles2_cmd_helper.target.darwin-x86_64.mk +++ b/gpu/gles2_cmd_helper.target.darwin-x86_64.mk @@ -73,12 +73,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -161,12 +166,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gles2_cmd_helper.target.linux-arm.mk b/gpu/gles2_cmd_helper.target.linux-arm.mk index 5f42c382a5..c569baf7fc 100644 --- a/gpu/gles2_cmd_helper.target.linux-arm.mk +++ b/gpu/gles2_cmd_helper.target.linux-arm.mk @@ -40,7 +40,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -72,12 +79,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -128,7 +140,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -160,12 +179,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gles2_cmd_helper.target.linux-arm64.mk b/gpu/gles2_cmd_helper.target.linux-arm64.mk index 5e9d5e2222..f2a1f6d4dd 100644 --- a/gpu/gles2_cmd_helper.target.linux-arm64.mk +++ b/gpu/gles2_cmd_helper.target.linux-arm64.mk @@ -69,12 +69,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -153,12 +158,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gles2_cmd_helper.target.linux-mips.mk b/gpu/gles2_cmd_helper.target.linux-mips.mk index e6310144ff..f4c6e16621 100644 --- a/gpu/gles2_cmd_helper.target.linux-mips.mk +++ b/gpu/gles2_cmd_helper.target.linux-mips.mk @@ -40,6 +40,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -72,12 +73,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -128,6 +134,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -160,12 +167,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gles2_cmd_helper.target.linux-x86.mk b/gpu/gles2_cmd_helper.target.linux-x86.mk index 5cb68b45a3..83e4d4f819 100644 --- a/gpu/gles2_cmd_helper.target.linux-x86.mk +++ b/gpu/gles2_cmd_helper.target.linux-x86.mk @@ -39,6 +39,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -73,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -127,6 +133,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -161,12 +168,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gles2_cmd_helper.target.linux-x86_64.mk b/gpu/gles2_cmd_helper.target.linux-x86_64.mk index bc494f89d2..aca51c9886 100644 --- a/gpu/gles2_cmd_helper.target.linux-x86_64.mk +++ b/gpu/gles2_cmd_helper.target.linux-x86_64.mk @@ -73,12 +73,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -161,12 +166,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gles2_implementation.target.darwin-arm.mk b/gpu/gles2_implementation.target.darwin-arm.mk index 90523bb606..ebbd6dfea1 100644 --- a/gpu/gles2_implementation.target.darwin-arm.mk +++ b/gpu/gles2_implementation.target.darwin-arm.mk @@ -50,7 +50,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -82,12 +89,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -145,7 +157,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -177,12 +196,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gles2_implementation.target.darwin-arm64.mk b/gpu/gles2_implementation.target.darwin-arm64.mk index 8035cfdb35..9f3f35d4a4 100644 --- a/gpu/gles2_implementation.target.darwin-arm64.mk +++ b/gpu/gles2_implementation.target.darwin-arm64.mk @@ -79,12 +79,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -170,12 +175,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gles2_implementation.target.darwin-mips.mk b/gpu/gles2_implementation.target.darwin-mips.mk index a7fdbab8b6..dc827aee0d 100644 --- a/gpu/gles2_implementation.target.darwin-mips.mk +++ b/gpu/gles2_implementation.target.darwin-mips.mk @@ -50,6 +50,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -82,12 +83,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -145,6 +151,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -177,12 +184,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gles2_implementation.target.darwin-x86.mk b/gpu/gles2_implementation.target.darwin-x86.mk index ee9c67fd9b..d688bdff4c 100644 --- a/gpu/gles2_implementation.target.darwin-x86.mk +++ b/gpu/gles2_implementation.target.darwin-x86.mk @@ -49,6 +49,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -83,12 +84,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -144,6 +150,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -178,12 +185,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gles2_implementation.target.darwin-x86_64.mk b/gpu/gles2_implementation.target.darwin-x86_64.mk index 58157eeb2d..cfcafb47a4 100644 --- a/gpu/gles2_implementation.target.darwin-x86_64.mk +++ b/gpu/gles2_implementation.target.darwin-x86_64.mk @@ -83,12 +83,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -178,12 +183,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gles2_implementation.target.linux-arm.mk b/gpu/gles2_implementation.target.linux-arm.mk index 90523bb606..ebbd6dfea1 100644 --- a/gpu/gles2_implementation.target.linux-arm.mk +++ b/gpu/gles2_implementation.target.linux-arm.mk @@ -50,7 +50,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -82,12 +89,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -145,7 +157,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -177,12 +196,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gles2_implementation.target.linux-arm64.mk b/gpu/gles2_implementation.target.linux-arm64.mk index 8035cfdb35..9f3f35d4a4 100644 --- a/gpu/gles2_implementation.target.linux-arm64.mk +++ b/gpu/gles2_implementation.target.linux-arm64.mk @@ -79,12 +79,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -170,12 +175,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gles2_implementation.target.linux-mips.mk b/gpu/gles2_implementation.target.linux-mips.mk index a7fdbab8b6..dc827aee0d 100644 --- a/gpu/gles2_implementation.target.linux-mips.mk +++ b/gpu/gles2_implementation.target.linux-mips.mk @@ -50,6 +50,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -82,12 +83,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -145,6 +151,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -177,12 +184,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gles2_implementation.target.linux-x86.mk b/gpu/gles2_implementation.target.linux-x86.mk index ee9c67fd9b..d688bdff4c 100644 --- a/gpu/gles2_implementation.target.linux-x86.mk +++ b/gpu/gles2_implementation.target.linux-x86.mk @@ -49,6 +49,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -83,12 +84,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -144,6 +150,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -178,12 +185,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gles2_implementation.target.linux-x86_64.mk b/gpu/gles2_implementation.target.linux-x86_64.mk index 58157eeb2d..cfcafb47a4 100644 --- a/gpu/gles2_implementation.target.linux-x86_64.mk +++ b/gpu/gles2_implementation.target.linux-x86_64.mk @@ -83,12 +83,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ @@ -178,12 +183,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DGLES2_IMPL_IMPLEMENTATION' \ '-DMESA_EGL_NO_X11_HEADERS' \ diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index b0ccb9936e..773182516e 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -281,7 +281,7 @@ 'config/gpu_util_unittest.cc', ], 'conditions': [ - ['OS == "android" and gtest_target_type == "shared_library"', { + ['OS == "android"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', ], @@ -350,7 +350,7 @@ 'command_buffer/tests/occlusion_query_unittest.cc', ], 'conditions': [ - ['OS == "android" and gtest_target_type == "shared_library"', { + ['OS == "android"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', ], @@ -591,7 +591,7 @@ }, ], }], - ['OS == "android" and gtest_target_type == "shared_library"', { + ['OS == "android"', { 'targets': [ { 'target_name': 'gl_tests_apk', @@ -606,6 +606,17 @@ '../build/apk_test.gypi', ], }, + { + 'target_name': 'gpu_unittests_apk', + 'type': 'none', + 'dependencies': [ + 'gpu_unittests', + ], + 'variables': { + 'test_suite_name': 'gpu_unittests', + }, + 'includes': [ '../build/apk_test.gypi' ], + }, ], }], ], diff --git a/gpu/gpu.target.darwin-arm.mk b/gpu/gpu.target.darwin-arm.mk index 5e9037623b..baf12b69fe 100644 --- a/gpu/gpu.target.darwin-arm.mk +++ b/gpu/gpu.target.darwin-arm.mk @@ -45,7 +45,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -77,12 +84,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -136,7 +148,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -168,12 +187,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu.target.darwin-arm64.mk b/gpu/gpu.target.darwin-arm64.mk index 6f6ab29467..ed6e900448 100644 --- a/gpu/gpu.target.darwin-arm64.mk +++ b/gpu/gpu.target.darwin-arm64.mk @@ -74,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -161,12 +166,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu.target.darwin-mips.mk b/gpu/gpu.target.darwin-mips.mk index 085677fe67..8f93ec0036 100644 --- a/gpu/gpu.target.darwin-mips.mk +++ b/gpu/gpu.target.darwin-mips.mk @@ -45,6 +45,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -77,12 +78,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -136,6 +142,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -168,12 +175,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu.target.darwin-x86.mk b/gpu/gpu.target.darwin-x86.mk index 19a3117fc8..1cd675eaa1 100644 --- a/gpu/gpu.target.darwin-x86.mk +++ b/gpu/gpu.target.darwin-x86.mk @@ -44,6 +44,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -78,12 +79,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -135,6 +141,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -169,12 +176,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu.target.darwin-x86_64.mk b/gpu/gpu.target.darwin-x86_64.mk index 35eeebe9a0..d48c249eba 100644 --- a/gpu/gpu.target.darwin-x86_64.mk +++ b/gpu/gpu.target.darwin-x86_64.mk @@ -78,12 +78,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -169,12 +174,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu.target.linux-arm.mk b/gpu/gpu.target.linux-arm.mk index 5e9037623b..baf12b69fe 100644 --- a/gpu/gpu.target.linux-arm.mk +++ b/gpu/gpu.target.linux-arm.mk @@ -45,7 +45,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -77,12 +84,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -136,7 +148,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -168,12 +187,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu.target.linux-arm64.mk b/gpu/gpu.target.linux-arm64.mk index 6f6ab29467..ed6e900448 100644 --- a/gpu/gpu.target.linux-arm64.mk +++ b/gpu/gpu.target.linux-arm64.mk @@ -74,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -161,12 +166,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu.target.linux-mips.mk b/gpu/gpu.target.linux-mips.mk index 085677fe67..8f93ec0036 100644 --- a/gpu/gpu.target.linux-mips.mk +++ b/gpu/gpu.target.linux-mips.mk @@ -45,6 +45,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -77,12 +78,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -136,6 +142,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -168,12 +175,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu.target.linux-x86.mk b/gpu/gpu.target.linux-x86.mk index 19a3117fc8..1cd675eaa1 100644 --- a/gpu/gpu.target.linux-x86.mk +++ b/gpu/gpu.target.linux-x86.mk @@ -44,6 +44,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -78,12 +79,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -135,6 +141,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -169,12 +176,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu.target.linux-x86_64.mk b/gpu/gpu.target.linux-x86_64.mk index 35eeebe9a0..d48c249eba 100644 --- a/gpu/gpu.target.linux-x86_64.mk +++ b/gpu/gpu.target.linux-x86_64.mk @@ -78,12 +78,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -169,12 +174,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi index 4550fc796f..dda0f3458b 100644 --- a/gpu/gpu_common.gypi +++ b/gpu/gpu_common.gypi @@ -48,23 +48,4 @@ 'command_buffer/client/vertex_array_object_manager.h', ] }, - 'conditions': [ - # Special target to wrap a gtest_target_type==shared_library - # gpu_unittests into an android apk for execution. - ['OS == "android" and gtest_target_type == "shared_library"', { - 'targets': [ - { - 'target_name': 'gpu_unittests_apk', - 'type': 'none', - 'dependencies': [ - 'gpu_unittests', - ], - 'variables': { - 'test_suite_name': 'gpu_unittests', - }, - 'includes': [ '../build/apk_test.gypi' ], - }, - ], - }], - ], } diff --git a/gpu/gpu_config.target.darwin-arm.mk b/gpu/gpu_config.target.darwin-arm.mk index 372162c682..10f32f8858 100644 --- a/gpu/gpu_config.target.darwin-arm.mk +++ b/gpu/gpu_config.target.darwin-arm.mk @@ -52,7 +52,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -84,12 +91,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ @@ -147,7 +159,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -179,12 +198,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gpu_config.target.darwin-arm64.mk b/gpu/gpu_config.target.darwin-arm64.mk index cb9f8cdce7..723f3afd24 100644 --- a/gpu/gpu_config.target.darwin-arm64.mk +++ b/gpu/gpu_config.target.darwin-arm64.mk @@ -81,12 +81,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ @@ -172,12 +177,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gpu_config.target.darwin-mips.mk b/gpu/gpu_config.target.darwin-mips.mk index 307e39d948..b7b2469c15 100644 --- a/gpu/gpu_config.target.darwin-mips.mk +++ b/gpu/gpu_config.target.darwin-mips.mk @@ -52,6 +52,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -84,12 +85,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ @@ -147,6 +153,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -179,12 +186,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gpu_config.target.darwin-x86.mk b/gpu/gpu_config.target.darwin-x86.mk index 4bc6cfc34c..29193c3b09 100644 --- a/gpu/gpu_config.target.darwin-x86.mk +++ b/gpu/gpu_config.target.darwin-x86.mk @@ -51,6 +51,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -85,12 +86,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ @@ -146,6 +152,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -180,12 +187,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gpu_config.target.darwin-x86_64.mk b/gpu/gpu_config.target.darwin-x86_64.mk index dec167605a..c2ba6a169e 100644 --- a/gpu/gpu_config.target.darwin-x86_64.mk +++ b/gpu/gpu_config.target.darwin-x86_64.mk @@ -85,12 +85,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ @@ -180,12 +185,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gpu_config.target.linux-arm.mk b/gpu/gpu_config.target.linux-arm.mk index 372162c682..10f32f8858 100644 --- a/gpu/gpu_config.target.linux-arm.mk +++ b/gpu/gpu_config.target.linux-arm.mk @@ -52,7 +52,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -84,12 +91,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ @@ -147,7 +159,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -179,12 +198,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gpu_config.target.linux-arm64.mk b/gpu/gpu_config.target.linux-arm64.mk index cb9f8cdce7..723f3afd24 100644 --- a/gpu/gpu_config.target.linux-arm64.mk +++ b/gpu/gpu_config.target.linux-arm64.mk @@ -81,12 +81,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ @@ -172,12 +177,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gpu_config.target.linux-mips.mk b/gpu/gpu_config.target.linux-mips.mk index 307e39d948..b7b2469c15 100644 --- a/gpu/gpu_config.target.linux-mips.mk +++ b/gpu/gpu_config.target.linux-mips.mk @@ -52,6 +52,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -84,12 +85,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ @@ -147,6 +153,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -179,12 +186,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gpu_config.target.linux-x86.mk b/gpu/gpu_config.target.linux-x86.mk index 4bc6cfc34c..29193c3b09 100644 --- a/gpu/gpu_config.target.linux-x86.mk +++ b/gpu/gpu_config.target.linux-x86.mk @@ -51,6 +51,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -85,12 +86,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ @@ -146,6 +152,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -180,12 +187,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gpu_config.target.linux-x86_64.mk b/gpu/gpu_config.target.linux-x86_64.mk index dec167605a..c2ba6a169e 100644 --- a/gpu/gpu_config.target.linux-x86_64.mk +++ b/gpu/gpu_config.target.linux-x86_64.mk @@ -85,12 +85,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ @@ -180,12 +185,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DMESA_EGL_NO_X11_HEADERS' \ '-DUSE_OPENSSL=1' \ diff --git a/gpu/gpu_ipc.target.darwin-arm.mk b/gpu/gpu_ipc.target.darwin-arm.mk index 0e644bc82b..c532fe0eba 100644 --- a/gpu/gpu_ipc.target.darwin-arm.mk +++ b/gpu/gpu_ipc.target.darwin-arm.mk @@ -41,7 +41,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -73,12 +80,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -129,7 +141,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -161,12 +180,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu_ipc.target.darwin-arm64.mk b/gpu/gpu_ipc.target.darwin-arm64.mk index ece901c26b..4332097106 100644 --- a/gpu/gpu_ipc.target.darwin-arm64.mk +++ b/gpu/gpu_ipc.target.darwin-arm64.mk @@ -70,12 +70,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -154,12 +159,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu_ipc.target.darwin-mips.mk b/gpu/gpu_ipc.target.darwin-mips.mk index 0bb72ad520..59c7ea4674 100644 --- a/gpu/gpu_ipc.target.darwin-mips.mk +++ b/gpu/gpu_ipc.target.darwin-mips.mk @@ -41,6 +41,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -73,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -129,6 +135,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -161,12 +168,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu_ipc.target.darwin-x86.mk b/gpu/gpu_ipc.target.darwin-x86.mk index 761cbb2626..77fbe60587 100644 --- a/gpu/gpu_ipc.target.darwin-x86.mk +++ b/gpu/gpu_ipc.target.darwin-x86.mk @@ -40,6 +40,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -74,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -128,6 +134,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -162,12 +169,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu_ipc.target.darwin-x86_64.mk b/gpu/gpu_ipc.target.darwin-x86_64.mk index d49a2bb89e..759e69c335 100644 --- a/gpu/gpu_ipc.target.darwin-x86_64.mk +++ b/gpu/gpu_ipc.target.darwin-x86_64.mk @@ -74,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -162,12 +167,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu_ipc.target.linux-arm.mk b/gpu/gpu_ipc.target.linux-arm.mk index 0e644bc82b..c532fe0eba 100644 --- a/gpu/gpu_ipc.target.linux-arm.mk +++ b/gpu/gpu_ipc.target.linux-arm.mk @@ -41,7 +41,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -73,12 +80,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -129,7 +141,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -161,12 +180,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu_ipc.target.linux-arm64.mk b/gpu/gpu_ipc.target.linux-arm64.mk index ece901c26b..4332097106 100644 --- a/gpu/gpu_ipc.target.linux-arm64.mk +++ b/gpu/gpu_ipc.target.linux-arm64.mk @@ -70,12 +70,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -154,12 +159,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu_ipc.target.linux-mips.mk b/gpu/gpu_ipc.target.linux-mips.mk index 0bb72ad520..59c7ea4674 100644 --- a/gpu/gpu_ipc.target.linux-mips.mk +++ b/gpu/gpu_ipc.target.linux-mips.mk @@ -41,6 +41,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -73,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -129,6 +135,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -161,12 +168,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu_ipc.target.linux-x86.mk b/gpu/gpu_ipc.target.linux-x86.mk index 761cbb2626..77fbe60587 100644 --- a/gpu/gpu_ipc.target.linux-x86.mk +++ b/gpu/gpu_ipc.target.linux-x86.mk @@ -40,6 +40,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -74,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -128,6 +134,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -162,12 +169,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/gpu_ipc.target.linux-x86_64.mk b/gpu/gpu_ipc.target.linux-x86_64.mk index d49a2bb89e..759e69c335 100644 --- a/gpu/gpu_ipc.target.linux-x86_64.mk +++ b/gpu/gpu_ipc.target.linux-x86_64.mk @@ -74,12 +74,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -162,12 +167,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ diff --git a/gpu/ipc/BUILD.gn b/gpu/ipc/BUILD.gn new file mode 100644 index 0000000000..a6249bf564 --- /dev/null +++ b/gpu/ipc/BUILD.gn @@ -0,0 +1,17 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("ipc") { + sources = [ + "gpu_command_buffer_traits.cc", + "gpu_command_buffer_traits.h", + ] + + configs += [ "//third_party/khronos:khronos_headers" ] + + deps = [ + "//gpu/command_buffer/common", + "//ipc", + ] +} diff --git a/gpu/skia_bindings/BUILD.gn b/gpu/skia_bindings/BUILD.gn new file mode 100644 index 0000000000..2bd2a44a3c --- /dev/null +++ b/gpu/skia_bindings/BUILD.gn @@ -0,0 +1,14 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("skia_bindings") { + sources = [ + "gl_bindings_skia_cmd_buffer.cc", + "gl_bindings_skia_cmd_buffer.h", + ] + deps = [ + "//gpu/command_buffer/client:gles2_c_lib", + "//skia", + ] +} diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm.mk index 0e5568505b..13f11a2efe 100644 --- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm.mk +++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm.mk @@ -42,7 +42,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -74,12 +81,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -88,10 +100,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -159,7 +173,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -191,12 +212,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -205,10 +231,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm64.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm64.mk index 613488a5ed..14b9fb4204 100644 --- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm64.mk +++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm64.mk @@ -71,12 +71,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -85,10 +90,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -184,12 +191,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -198,10 +210,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk index 96c9e0069c..268b6b6917 100644 --- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk +++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk @@ -42,6 +42,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -74,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -88,10 +94,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -159,6 +167,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -191,12 +200,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -205,10 +219,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86.mk index 479c8aff7a..a7b36a129f 100644 --- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86.mk +++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86.mk @@ -41,6 +41,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -75,12 +76,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -89,10 +95,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -158,6 +166,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -192,12 +201,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -206,10 +220,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86_64.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86_64.mk index 7e72b5e666..e10dffa1c0 100644 --- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86_64.mk +++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86_64.mk @@ -75,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -89,10 +94,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -192,12 +199,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -206,10 +218,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm.mk index 0e5568505b..13f11a2efe 100644 --- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm.mk +++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm.mk @@ -42,7 +42,14 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -74,12 +81,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -88,10 +100,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -159,7 +173,14 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-partial-inlining \ + -fno-early-inlining \ + -fno-tree-copy-prop \ + -fno-tree-loop-optimize \ + -fno-move-loop-invariants \ + -fno-caller-saves \ -Wno-psabi \ -ffunction-sections \ -funwind-tables \ @@ -191,12 +212,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -205,10 +231,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm64.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm64.mk index 613488a5ed..14b9fb4204 100644 --- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm64.mk +++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm64.mk @@ -71,12 +71,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -85,10 +90,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -184,12 +191,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -198,10 +210,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-mips.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-mips.mk index 96c9e0069c..268b6b6917 100644 --- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-mips.mk +++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-mips.mk @@ -42,6 +42,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -74,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -88,10 +94,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -159,6 +167,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -EL \ -mhard-float \ -ffunction-sections \ @@ -191,12 +200,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -205,10 +219,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk index 479c8aff7a..a7b36a129f 100644 --- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk +++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk @@ -41,6 +41,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -75,12 +76,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -89,10 +95,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -158,6 +166,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -msse2 \ -mfpmath=sse \ -mmmx \ @@ -192,12 +201,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -206,10 +220,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86_64.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86_64.mk index 7e72b5e666..e10dffa1c0 100644 --- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86_64.mk +++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86_64.mk @@ -75,12 +75,17 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -89,10 +94,12 @@ MY_DEFS_Debug := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -192,12 +199,17 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ @@ -206,10 +218,12 @@ MY_DEFS_Release := \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ - '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ + '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \ + '-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \ + '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ |