Commit dce41bea authored by gman@chromium.org's avatar gman@chromium.org

Fix glGetTexParameter so it works for TEXTURE_CUBE_MAP

TEST=passes new webgl conformance test
BUG=136538


Review URL: https://chromiumcodereview.appspot.com/10735038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146010 0039d316-1c4b-4281-b951-d872f2087c98
parent 33e14911
...@@ -213,12 +213,7 @@ _ENUM_LISTS = { ...@@ -213,12 +213,7 @@ _ENUM_LISTS = {
'type': 'GLenum', 'type': 'GLenum',
'valid': [ 'valid': [
'GL_TEXTURE_2D', 'GL_TEXTURE_2D',
'GL_TEXTURE_CUBE_MAP_POSITIVE_X', 'GL_TEXTURE_CUBE_MAP',
'GL_TEXTURE_CUBE_MAP_NEGATIVE_X',
'GL_TEXTURE_CUBE_MAP_POSITIVE_Y',
'GL_TEXTURE_CUBE_MAP_NEGATIVE_Y',
'GL_TEXTURE_CUBE_MAP_POSITIVE_Z',
'GL_TEXTURE_CUBE_MAP_NEGATIVE_Z',
], ],
'invalid': [ 'invalid': [
'GL_PROXY_TEXTURE_CUBE_MAP', 'GL_PROXY_TEXTURE_CUBE_MAP',
......
...@@ -854,12 +854,7 @@ std::string GLES2Util::GetStringGetMaxIndexType(uint32 value) { ...@@ -854,12 +854,7 @@ std::string GLES2Util::GetStringGetMaxIndexType(uint32 value) {
std::string GLES2Util::GetStringGetTexParamTarget(uint32 value) { std::string GLES2Util::GetStringGetTexParamTarget(uint32 value) {
static EnumToString string_table[] = { static EnumToString string_table[] = {
{ GL_TEXTURE_2D, "GL_TEXTURE_2D" }, { GL_TEXTURE_2D, "GL_TEXTURE_2D" },
{ GL_TEXTURE_CUBE_MAP_POSITIVE_X, "GL_TEXTURE_CUBE_MAP_POSITIVE_X" }, { GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP" },
{ GL_TEXTURE_CUBE_MAP_NEGATIVE_X, "GL_TEXTURE_CUBE_MAP_NEGATIVE_X" },
{ GL_TEXTURE_CUBE_MAP_POSITIVE_Y, "GL_TEXTURE_CUBE_MAP_POSITIVE_Y" },
{ GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" },
{ GL_TEXTURE_CUBE_MAP_POSITIVE_Z, "GL_TEXTURE_CUBE_MAP_POSITIVE_Z" },
{ GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" },
}; };
return GLES2Util::GetQualifiedEnumString( return GLES2Util::GetQualifiedEnumString(
string_table, arraysize(string_table), value); string_table, arraysize(string_table), value);
......
...@@ -216,12 +216,7 @@ static GLenum valid_get_max_index_type_table[] = { ...@@ -216,12 +216,7 @@ static GLenum valid_get_max_index_type_table[] = {
static GLenum valid_get_tex_param_target_table[] = { static GLenum valid_get_tex_param_target_table[] = {
GL_TEXTURE_2D, GL_TEXTURE_2D,
GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP,
GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
GL_TEXTURE_CUBE_MAP_POSITIVE_Z,
GL_TEXTURE_CUBE_MAP_NEGATIVE_Z,
}; };
static GLenum valid_hint_mode_table[] = { static GLenum valid_hint_mode_table[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment