diff options
| author | Haixia Shi <hshi@chromium.org> | 2015-08-20 18:27:10 -0700 |
|---|---|---|
| committer | Haixia Shi <hshi@chromium.org> | 2015-08-21 01:28:44 +0000 |
| commit | 864af034586809653961962d1c7368b228ec7b08 (patch) | |
| tree | d0acb474caa853d8661e19c4b1ea638ab80abf2e /gpu | |
| parent | 6f0467529c1d941ae4200daf0ad971d28ea7f1d4 (diff) | |
| download | chromium_src-864af034586809653961962d1c7368b228ec7b08.zip chromium_src-864af034586809653961962d1c7368b228ec7b08.tar.gz chromium_src-864af034586809653961962d1c7368b228ec7b08.tar.bz2 | |
Rename enum gfx::BufferFormat::RGBX_8888 to BGRX_8888
This seems to be a typo from the beginning. The enum value RGBX_8888 is
in fact treated as BGRX_8888 format everywhere, so we should correct it
to prevent future confusion.
BUG=none
TEST=trybot (this is a trivial renaming CL)
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
R=reveman@chromium.org, spang@chromium.org
TBR=posciak (OWNER content/common/gpu/media/vaapi_drm_picture.cc as communicated verbally)
Review URL: https://codereview.chromium.org/1301253003 .
Cr-Commit-Position: refs/heads/master@{#344640}
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/image_factory.cc | 8 | ||||
| -rw-r--r-- | gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc | 4 | ||||
| -rw-r--r-- | gpu/command_buffer/tests/gl_manager.cc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/gpu/command_buffer/service/image_factory.cc b/gpu/command_buffer/service/image_factory.cc index eeecc16..8d9cde6 100644 --- a/gpu/command_buffer/service/image_factory.cc +++ b/gpu/command_buffer/service/image_factory.cc @@ -22,7 +22,7 @@ gfx::BufferFormat ImageFactory::ImageFormatToGpuMemoryBufferFormat( case GL_R8: return gfx::BufferFormat::R_8; case GL_RGB: - return gfx::BufferFormat::RGBX_8888; + return gfx::BufferFormat::BGRX_8888; case GL_RGBA: return gfx::BufferFormat::RGBA_8888; case GL_BGRA_EXT: @@ -67,12 +67,12 @@ bool ImageFactory::IsImageFormatCompatibleWithGpuMemoryBufferFormat( case gfx::BufferFormat::ATC: case gfx::BufferFormat::ATCIA: case gfx::BufferFormat::BGRA_8888: + case gfx::BufferFormat::BGRX_8888: case gfx::BufferFormat::DXT1: case gfx::BufferFormat::DXT5: case gfx::BufferFormat::ETC1: case gfx::BufferFormat::R_8: case gfx::BufferFormat::RGBA_8888: - case gfx::BufferFormat::RGBX_8888: case gfx::BufferFormat::YUV_420: return ImageFormatToGpuMemoryBufferFormat(internalformat) == format; case gfx::BufferFormat::RGBA_4444: @@ -105,7 +105,7 @@ bool ImageFactory::IsGpuMemoryBufferFormatSupported( return capabilities.texture_rg; case gfx::BufferFormat::RGBA_4444: case gfx::BufferFormat::RGBA_8888: - case gfx::BufferFormat::RGBX_8888: + case gfx::BufferFormat::BGRX_8888: case gfx::BufferFormat::YUV_420: case gfx::BufferFormat::YUV_420_BIPLANAR: return true; @@ -132,7 +132,7 @@ bool ImageFactory::IsImageSizeValidForGpuMemoryBufferFormat( case gfx::BufferFormat::RGBA_4444: case gfx::BufferFormat::RGBA_8888: case gfx::BufferFormat::BGRA_8888: - case gfx::BufferFormat::RGBX_8888: + case gfx::BufferFormat::BGRX_8888: return true; case gfx::BufferFormat::YUV_420: case gfx::BufferFormat::YUV_420_BIPLANAR: diff --git a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc index 4d6f933..45003a3 100644 --- a/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc +++ b/gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc @@ -112,7 +112,7 @@ void SetRow(gfx::BufferFormat format, case gfx::BufferFormat::DXT1: case gfx::BufferFormat::DXT5: case gfx::BufferFormat::ETC1: - case gfx::BufferFormat::RGBX_8888: + case gfx::BufferFormat::BGRX_8888: case gfx::BufferFormat::YUV_420: case gfx::BufferFormat::YUV_420_BIPLANAR: NOTREACHED(); @@ -136,7 +136,7 @@ GLenum InternalFormat(gfx::BufferFormat format) { case gfx::BufferFormat::DXT1: case gfx::BufferFormat::DXT5: case gfx::BufferFormat::ETC1: - case gfx::BufferFormat::RGBX_8888: + case gfx::BufferFormat::BGRX_8888: case gfx::BufferFormat::YUV_420: case gfx::BufferFormat::YUV_420_BIPLANAR: NOTREACHED(); diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc index f32792f..936e326 100644 --- a/gpu/command_buffer/tests/gl_manager.cc +++ b/gpu/command_buffer/tests/gl_manager.cc @@ -50,7 +50,7 @@ size_t SubsamplingFactor(gfx::BufferFormat format, int plane) { case gfx::BufferFormat::R_8: case gfx::BufferFormat::RGBA_4444: case gfx::BufferFormat::RGBA_8888: - case gfx::BufferFormat::RGBX_8888: + case gfx::BufferFormat::BGRX_8888: case gfx::BufferFormat::BGRA_8888: return 1; case gfx::BufferFormat::YUV_420: { @@ -89,7 +89,7 @@ size_t StrideInBytes(size_t width, gfx::BufferFormat format, int plane) { case gfx::BufferFormat::BGRA_8888: DCHECK_EQ(plane, 0); return width * 4; - case gfx::BufferFormat::RGBX_8888: + case gfx::BufferFormat::BGRX_8888: NOTREACHED(); return 0; case gfx::BufferFormat::YUV_420: |