diff options
Diffstat (limited to 'ui/gl')
| -rw-r--r-- | ui/gl/gl_bindings.h | 3 | ||||
| -rw-r--r-- | ui/gl/gl_enums_implementation_autogen.h | 26 | ||||
| -rw-r--r-- | ui/gl/gl_surface_ozone.cc | 2 |
3 files changed, 9 insertions, 22 deletions
diff --git a/ui/gl/gl_bindings.h b/ui/gl/gl_bindings.h index c1ad779..f043bef 100644 --- a/ui/gl/gl_bindings.h +++ b/ui/gl/gl_bindings.h @@ -127,8 +127,7 @@ #define GL_COMMANDS_COMPLETED_CHROMIUM 0x84F7 // GL_CHROMIUM_gpu_memory_buffer_image -#define GL_MAP_CHROMIUM 0x78F1 -#define GL_SCANOUT_CHROMIUM 0x78F2 +#define GL_READ_WRITE_CHROMIUM 0x78F2 // GL_CHROMIUM_yuv_420_image #define GL_RGB_YUV_420_CHROMIUM 0x78FA diff --git a/ui/gl/gl_enums_implementation_autogen.h b/ui/gl/gl_enums_implementation_autogen.h index 54dea5a..e6d7c36 100644 --- a/ui/gl/gl_enums_implementation_autogen.h +++ b/ui/gl/gl_enums_implementation_autogen.h @@ -46,9 +46,6 @@ static const GLEnums::EnumToString enum_to_string_table[] = { 0x0BC2, "GL_ALPHA_TEST_REF_QCOM", }, { - 0x78EF, "GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM", - }, - { 0x884D, "GL_TEXTURE_COMPARE_FUNC_EXT", }, { @@ -97,7 +94,7 @@ static const GLEnums::EnumToString enum_to_string_table[] = { 0x9500, "GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL", }, { - 0x78F2, "GL_SCANOUT_CHROMIUM", + 0x78F2, "GL_READ_WRITE_CHROMIUM", }, { 0x9138, "GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG", @@ -1165,9 +1162,6 @@ static const GLEnums::EnumToString enum_to_string_table[] = { 0x8A44, "GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER", }, { - 0x6000, "GL_TEXTURE_POOL_CHROMIUM", - }, - { 0x0B74, "GL_DEPTH_FUNC", }, { @@ -1495,7 +1489,7 @@ static const GLEnums::EnumToString enum_to_string_table[] = { 0x04, "GL_LINE_TO_CHROMIUM", }, { - 0x0BA7, "GL_PATH_PROJECTION_MATRIX_CHROMIUM", + 0x8905, "GL_MAX_PROGRAM_TEXEL_OFFSET", }, { 0x00080000, "GL_STENCIL_BUFFER_BIT3_QCOM", @@ -1906,6 +1900,9 @@ static const GLEnums::EnumToString enum_to_string_table[] = { 0x8CD9, "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS", }, { + 24, "GL_SYNC_TOKEN_SIZE_CHROMIUM", + }, + { 0x84CC, "GL_TEXTURE12", }, { @@ -1915,7 +1912,7 @@ static const GLEnums::EnumToString enum_to_string_table[] = { 0x84CA, "GL_TEXTURE10", }, { - 0x78F1, "GL_MAP_CHROMIUM", + 0x0BA7, "GL_PATH_PROJECTION_MATRIX_CHROMIUM", }, { 0x84CF, "GL_TEXTURE15", @@ -2269,9 +2266,6 @@ static const GLEnums::EnumToString enum_to_string_table[] = { 0x84DC, "GL_TEXTURE28", }, { - 0x6002, "GL_TEXTURE_POOL_UNMANAGED_CHROMIUM", - }, - { 0x84DA, "GL_TEXTURE26", }, { @@ -2845,7 +2839,7 @@ static const GLEnums::EnumToString enum_to_string_table[] = { 0x78EE, "GL_PIXEL_PACK_TRANSFER_BUFFER_BINDING_CHROMIUM", }, { - 0x6001, "GL_TEXTURE_POOL_MANAGED_CHROMIUM", + 0x78EF, "GL_PIXEL_UNPACK_TRANSFER_BUFFER_BINDING_CHROMIUM", }, { 0x0B45, "GL_CULL_FACE_MODE", @@ -2857,9 +2851,6 @@ static const GLEnums::EnumToString enum_to_string_table[] = { 0x00100000, "GL_STENCIL_BUFFER_BIT4_QCOM", }, { - 24, "GL_SYNC_TOKEN_SIZE_CHROMIUM", - }, - { 0x8E4E, "GL_LAST_VERTEX_CONVENTION_EXT", }, { @@ -3001,9 +2992,6 @@ static const GLEnums::EnumToString enum_to_string_table[] = { 0x0A, "GL_QUADRATIC_CURVE_TO_CHROMIUM", }, { - 0x8905, "GL_MAX_PROGRAM_TEXEL_OFFSET", - }, - { 0x8508, "GL_DECR_WRAP", }, { diff --git a/ui/gl/gl_surface_ozone.cc b/ui/gl/gl_surface_ozone.cc index ad264cc..377597d 100644 --- a/ui/gl/gl_surface_ozone.cc +++ b/ui/gl/gl_surface_ozone.cc @@ -565,7 +565,7 @@ bool GLSurfaceOzoneSurfacelessSurfaceImpl::CreatePixmaps() { ->GetSurfaceFactoryOzone() ->CreateNativePixmap(widget_, GetSize(), gfx::BufferFormat::BGRA_8888, - gfx::BufferUsage::SCANOUT); + gfx::BufferUsage::GPU_READ_WRITE); if (!pixmap) return false; scoped_refptr<GLImageOzoneNativePixmap> image = |