diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 01:26:04 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 01:26:04 +0000 |
| commit | 58ae32fcc1434cf443b01d05172597c394147317 (patch) | |
| tree | 798110fc304595922ca5918c73ec24d81a8caf5d /gpu | |
| parent | 93da4fb1157bec1f6fd9e802d4ddc1e4b8868768 (diff) | |
| download | chromium_src-58ae32fcc1434cf443b01d05172597c394147317.zip chromium_src-58ae32fcc1434cf443b01d05172597c394147317.tar.gz chromium_src-58ae32fcc1434cf443b01d05172597c394147317.tar.bz2 | |
Translate a few OpenGL ES values to OpenGL values.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/1604031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 3d8b0af..911c19a 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -35,6 +35,17 @@ #define GL_DEPTH24_STENCIL8 0x88F0 #endif +#if defined(UNIT_TEST) + +// OpenGL constants not defined in OpenGL ES 2.0 needed when compiling +// unit tests. For native OpenGL ES 2.0 backend these are not used. For OpenGL +// backend these must be defined by the local system. +#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 +#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A +#define GL_MAX_VARYING_FLOATS 0x8B4B + +#endif + namespace gpu { namespace gles2 { @@ -1848,26 +1859,31 @@ bool GLES2DecoderImpl::GetHelper( DCHECK(params); DCHECK(num_written); switch (pname) { +#if !defined(GLES2_GPU_SERVICE_BACKEND_NATIVE_GLES2) case GL_IMPLEMENTATION_COLOR_READ_FORMAT: *num_written = 1; - *params = GL_RGB; // TODO(gman): get correct format. + *params = GL_RGBA; // TODO(gman): get correct format. return true; case GL_IMPLEMENTATION_COLOR_READ_TYPE: *num_written = 1; *params = GL_UNSIGNED_BYTE; // TODO(gman): get correct type. return true; case GL_MAX_FRAGMENT_UNIFORM_VECTORS: + glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, params); *num_written = 1; - *params = 16; // TODO(gman): get correct value. + *params /= 4; return true; case GL_MAX_VARYING_VECTORS: + glGetIntegerv(GL_MAX_VARYING_FLOATS, params); *num_written = 1; - *params = 8; // TODO(gman): get correct value. + *params /= 4; return true; case GL_MAX_VERTEX_UNIFORM_VECTORS: + glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS, params); *num_written = 1; - *params = 128; // TODO(gman): get correct value. + *params /= 4; return true; +#endif case GL_NUM_COMPRESSED_TEXTURE_FORMATS: *num_written = 1; *params = 0; // We don't support compressed textures. |