Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Side by Side Diff: gpu/command_buffer/service/image_factory.cc

Issue 1051503003: Add R_8 GPU memory buffers format. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix validation problem in StrideInBytes. Deals with GL_RED/GL_LUMINANCE. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/image_factory.h" 5 #include "gpu/command_buffer/service/image_factory.h"
6 6
7 #include "gpu/command_buffer/common/capabilities.h" 7 #include "gpu/command_buffer/common/capabilities.h"
8 #include "ui/gl/gl_bindings.h" 8 #include "ui/gl/gl_bindings.h"
9 9
10 namespace gpu { 10 namespace gpu {
11 11
12 ImageFactory::ImageFactory() { 12 ImageFactory::ImageFactory() {
13 } 13 }
14 14
15 ImageFactory::~ImageFactory() { 15 ImageFactory::~ImageFactory() {
16 } 16 }
17 17
18 // static 18 // static
19 gfx::GpuMemoryBuffer::Format ImageFactory::ImageFormatToGpuMemoryBufferFormat( 19 gfx::GpuMemoryBuffer::Format ImageFactory::ImageFormatToGpuMemoryBufferFormat(
20 unsigned internalformat) { 20 unsigned internalformat) {
21 switch (internalformat) { 21 switch (internalformat) {
22 case GL_LUMINANCE:
23 case GL_R8:
24 return gfx::GpuMemoryBuffer::R_8;
22 case GL_RGB: 25 case GL_RGB:
23 return gfx::GpuMemoryBuffer::RGBX_8888; 26 return gfx::GpuMemoryBuffer::RGBX_8888;
24 case GL_RGBA: 27 case GL_RGBA:
25 return gfx::GpuMemoryBuffer::RGBA_8888; 28 return gfx::GpuMemoryBuffer::RGBA_8888;
26 case GL_ATC_RGB_AMD: 29 case GL_ATC_RGB_AMD:
27 return gfx::GpuMemoryBuffer::ATC; 30 return gfx::GpuMemoryBuffer::ATC;
28 case GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD: 31 case GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD:
29 return gfx::GpuMemoryBuffer::ATCIA; 32 return gfx::GpuMemoryBuffer::ATCIA;
30 case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: 33 case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
31 return gfx::GpuMemoryBuffer::DXT1; 34 return gfx::GpuMemoryBuffer::DXT1;
(...skipping 28 matching lines...) Expand all
60 switch (internalformat) { 63 switch (internalformat) {
61 case GL_RGB: 64 case GL_RGB:
62 switch (format) { 65 switch (format) {
63 case gfx::GpuMemoryBuffer::ATC: 66 case gfx::GpuMemoryBuffer::ATC:
64 case gfx::GpuMemoryBuffer::ATCIA: 67 case gfx::GpuMemoryBuffer::ATCIA:
65 case gfx::GpuMemoryBuffer::DXT1: 68 case gfx::GpuMemoryBuffer::DXT1:
66 case gfx::GpuMemoryBuffer::DXT5: 69 case gfx::GpuMemoryBuffer::DXT5:
67 case gfx::GpuMemoryBuffer::ETC1: 70 case gfx::GpuMemoryBuffer::ETC1:
68 case gfx::GpuMemoryBuffer::RGBX_8888: 71 case gfx::GpuMemoryBuffer::RGBX_8888:
69 return true; 72 return true;
73 case gfx::GpuMemoryBuffer::R_8:
70 case gfx::GpuMemoryBuffer::RGBA_8888: 74 case gfx::GpuMemoryBuffer::RGBA_8888:
71 case gfx::GpuMemoryBuffer::BGRA_8888: 75 case gfx::GpuMemoryBuffer::BGRA_8888:
72 return false; 76 return false;
73 } 77 }
74 NOTREACHED(); 78 NOTREACHED();
75 return false; 79 return false;
76 case GL_RGBA: 80 case GL_RGBA:
77 switch (format) { 81 switch (format) {
82 case gfx::GpuMemoryBuffer::R_8:
78 case gfx::GpuMemoryBuffer::RGBX_8888: 83 case gfx::GpuMemoryBuffer::RGBX_8888:
79 return false; 84 return false;
80 case gfx::GpuMemoryBuffer::ATC: 85 case gfx::GpuMemoryBuffer::ATC:
81 case gfx::GpuMemoryBuffer::ATCIA: 86 case gfx::GpuMemoryBuffer::ATCIA:
82 case gfx::GpuMemoryBuffer::DXT1: 87 case gfx::GpuMemoryBuffer::DXT1:
83 case gfx::GpuMemoryBuffer::DXT5: 88 case gfx::GpuMemoryBuffer::DXT5:
84 case gfx::GpuMemoryBuffer::ETC1: 89 case gfx::GpuMemoryBuffer::ETC1:
85 case gfx::GpuMemoryBuffer::RGBA_8888: 90 case gfx::GpuMemoryBuffer::RGBA_8888:
86 case gfx::GpuMemoryBuffer::BGRA_8888: 91 case gfx::GpuMemoryBuffer::BGRA_8888:
87 return true; 92 return true;
88 } 93 }
89 NOTREACHED(); 94 case GL_LUMINANCE:
reveman 2015/04/01 13:14:33 please keep this NOTREACHED
Daniele Castagna 2015/04/01 21:58:34 Done.
90 return false; 95 case GL_R8:
96 return format == gfx::GpuMemoryBuffer::R_8;
91 default: 97 default:
92 NOTREACHED(); 98 NOTREACHED();
93 return false; 99 return false;
94 } 100 }
95 } 101 }
96 102
97 // static 103 // static
98 bool ImageFactory::IsGpuMemoryBufferFormatSupported( 104 bool ImageFactory::IsGpuMemoryBufferFormatSupported(
99 gfx::GpuMemoryBuffer::Format format, 105 gfx::GpuMemoryBuffer::Format format,
100 const gpu::Capabilities& capabilities) { 106 const gpu::Capabilities& capabilities) {
101 switch (format) { 107 switch (format) {
102 case gfx::GpuMemoryBuffer::ATC: 108 case gfx::GpuMemoryBuffer::ATC:
103 case gfx::GpuMemoryBuffer::ATCIA: 109 case gfx::GpuMemoryBuffer::ATCIA:
104 return capabilities.texture_format_atc; 110 return capabilities.texture_format_atc;
105 case gfx::GpuMemoryBuffer::BGRA_8888: 111 case gfx::GpuMemoryBuffer::BGRA_8888:
106 return capabilities.texture_format_bgra8888; 112 return capabilities.texture_format_bgra8888;
107 case gfx::GpuMemoryBuffer::DXT1: 113 case gfx::GpuMemoryBuffer::DXT1:
108 return capabilities.texture_format_dxt1; 114 return capabilities.texture_format_dxt1;
109 case gfx::GpuMemoryBuffer::DXT5: 115 case gfx::GpuMemoryBuffer::DXT5:
110 return capabilities.texture_format_dxt5; 116 return capabilities.texture_format_dxt5;
111 case gfx::GpuMemoryBuffer::ETC1: 117 case gfx::GpuMemoryBuffer::ETC1:
112 return capabilities.texture_format_etc1; 118 return capabilities.texture_format_etc1;
119 case gfx::GpuMemoryBuffer::R_8:
113 case gfx::GpuMemoryBuffer::RGBA_8888: 120 case gfx::GpuMemoryBuffer::RGBA_8888:
114 case gfx::GpuMemoryBuffer::RGBX_8888: 121 case gfx::GpuMemoryBuffer::RGBX_8888:
115 return true; 122 return true;
116 } 123 }
117 124
118 NOTREACHED(); 125 NOTREACHED();
119 return false; 126 return false;
120 } 127 }
121 128
122 // static 129 // static
123 bool ImageFactory::IsImageSizeValidForGpuMemoryBufferFormat( 130 bool ImageFactory::IsImageSizeValidForGpuMemoryBufferFormat(
124 const gfx::Size& size, 131 const gfx::Size& size,
125 gfx::GpuMemoryBuffer::Format format) { 132 gfx::GpuMemoryBuffer::Format format) {
126 switch (format) { 133 switch (format) {
127 case gfx::GpuMemoryBuffer::ATC: 134 case gfx::GpuMemoryBuffer::ATC:
128 case gfx::GpuMemoryBuffer::ATCIA: 135 case gfx::GpuMemoryBuffer::ATCIA:
129 case gfx::GpuMemoryBuffer::DXT1: 136 case gfx::GpuMemoryBuffer::DXT1:
130 case gfx::GpuMemoryBuffer::DXT5: 137 case gfx::GpuMemoryBuffer::DXT5:
131 case gfx::GpuMemoryBuffer::ETC1: 138 case gfx::GpuMemoryBuffer::ETC1:
132 // Compressed images must have a width and height that's evenly divisible 139 // Compressed images must have a width and height that's evenly divisible
133 // by the block size. 140 // by the block size.
134 return size.width() % 4 == 0 && size.height() % 4 == 0; 141 return size.width() % 4 == 0 && size.height() % 4 == 0;
142 case gfx::GpuMemoryBuffer::R_8:
135 case gfx::GpuMemoryBuffer::RGBA_8888: 143 case gfx::GpuMemoryBuffer::RGBA_8888:
136 case gfx::GpuMemoryBuffer::BGRA_8888: 144 case gfx::GpuMemoryBuffer::BGRA_8888:
137 case gfx::GpuMemoryBuffer::RGBX_8888: 145 case gfx::GpuMemoryBuffer::RGBX_8888:
138 return true; 146 return true;
139 } 147 }
140 148
141 NOTREACHED(); 149 NOTREACHED();
142 return false; 150 return false;
143 } 151 }
144 152
145 } // namespace gpu 153 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698