Skip to content

A
angle
Commit 74be296b by Lingfeng Yang Committed by Commit Bot
Options

GLES1: Texture environments setup

- Revise entry point definitions to use packed enums BUG=angleproject:2306 Change-Id: I06ad95f475d1dbaf07ec24ff2544503c4a44e826 Reviewed-on: https://chromium-review.googlesource.com/1090996Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Lingfeng Yang <lfy@google.com>
parent ea17575d
Showing with 449 additions and 195 deletions
scripts/entry_point_packed_gl_enums.json
...@@ -187,6 +187,18 @@ ...@@ -187,6 +187,18 @@
"glGetQueryivRobustANGLE": { "glGetQueryivRobustANGLE": {
"target": "QueryType" "target": "QueryType"
}, },
"glGetTexEnvfv": {
"target": "TextureEnvTarget",
"pname": "TextureEnvParameter"
},
"glGetTexEnviv": {
"target": "TextureEnvTarget",
"pname": "TextureEnvParameter"
},
"glGetTexEnvxv": {
"target": "TextureEnvTarget",
"pname": "TextureEnvParameter"
},
"glGetTexLevelParameterfv": { "glGetTexLevelParameterfv": {
"target": "TextureTarget" "target": "TextureTarget"
}, },
...@@ -265,6 +277,30 @@ ...@@ -265,6 +277,30 @@
"glShadeModel": { "glShadeModel": {
"mode": "ShadingModel" "mode": "ShadingModel"
}, },
"glTexEnvf": {
"target": "TextureEnvTarget",
"pname": "TextureEnvParameter"
},
"glTexEnvfv": {
"target": "TextureEnvTarget",
"pname": "TextureEnvParameter"
},
"glTexEnvi": {
"target": "TextureEnvTarget",
"pname": "TextureEnvParameter"
},
"glTexEnviv": {
"target": "TextureEnvTarget",
"pname": "TextureEnvParameter"
},
"glTexEnvx": {
"target": "TextureEnvTarget",
"pname": "TextureEnvParameter"
},
"glTexEnvxv": {
"target": "TextureEnvTarget",
"pname": "TextureEnvParameter"
},
"glTexImage2D": { "glTexImage2D": {
"target": "TextureTarget" "target": "TextureTarget"
}, },
......
src/common/PackedGLEnums_autogen.cpp
...@@ -824,6 +824,74 @@ GLenum ToGLenum(TextureEnvMode from) ...@@ -824,6 +824,74 @@ GLenum ToGLenum(TextureEnvMode from)
} }
template <> template <>
TextureEnvParameter FromGLenum<TextureEnvParameter>(GLenum from)
{
switch (from)
{
case GL_TEXTURE_ENV_MODE:
return TextureEnvParameter::Mode;
case GL_TEXTURE_ENV_COLOR:
return TextureEnvParameter::Color;
case GL_COMBINE_RGB:
return TextureEnvParameter::CombineRgb;
case GL_COMBINE_ALPHA:
return TextureEnvParameter::CombineAlpha;
case GL_RGB_SCALE:
return TextureEnvParameter::RgbScale;
case GL_ALPHA_SCALE:
return TextureEnvParameter::AlphaScale;
default:
return TextureEnvParameter::InvalidEnum;
}
}
GLenum ToGLenum(TextureEnvParameter from)
{
switch (from)
{
case TextureEnvParameter::Mode:
return GL_TEXTURE_ENV_MODE;
case TextureEnvParameter::Color:
return GL_TEXTURE_ENV_COLOR;
case TextureEnvParameter::CombineRgb:
return GL_COMBINE_RGB;
case TextureEnvParameter::CombineAlpha:
return GL_COMBINE_ALPHA;
case TextureEnvParameter::RgbScale:
return GL_RGB_SCALE;
case TextureEnvParameter::AlphaScale:
return GL_ALPHA_SCALE;
default:
UNREACHABLE();
return 0;
}
}
template <>
TextureEnvTarget FromGLenum<TextureEnvTarget>(GLenum from)
{
switch (from)
{
case GL_TEXTURE_ENV:
return TextureEnvTarget::Env;
default:
return TextureEnvTarget::InvalidEnum;
}
}
GLenum ToGLenum(TextureEnvTarget from)
{
switch (from)
{
case TextureEnvTarget::Env:
return GL_TEXTURE_ENV;
default:
UNREACHABLE();
return 0;
}
}
template <>
TextureOp FromGLenum<TextureOp>(GLenum from) TextureOp FromGLenum<TextureOp>(GLenum from)
{ {
switch (from) switch (from)
......
src/common/PackedGLEnums_autogen.h
...@@ -328,6 +328,35 @@ template <> ...@@ -328,6 +328,35 @@ template <>
TextureEnvMode FromGLenum<TextureEnvMode>(GLenum from); TextureEnvMode FromGLenum<TextureEnvMode>(GLenum from);
GLenum ToGLenum(TextureEnvMode from); GLenum ToGLenum(TextureEnvMode from);
enum class TextureEnvParameter : uint8_t
{
Mode = 0,
Color = 1,
CombineRgb = 2,
CombineAlpha = 3,
RgbScale = 4,
AlphaScale = 5,
InvalidEnum = 6,
EnumCount = 6,
};
template <>
TextureEnvParameter FromGLenum<TextureEnvParameter>(GLenum from);
GLenum ToGLenum(TextureEnvParameter from);
enum class TextureEnvTarget : uint8_t
{
Env = 0,
InvalidEnum = 1,
EnumCount = 1,
};
template <>
TextureEnvTarget FromGLenum<TextureEnvTarget>(GLenum from);
GLenum ToGLenum(TextureEnvTarget from);
enum class TextureOp : uint8_t enum class TextureOp : uint8_t
{ {
OneMinusSrcAlpha = 0, OneMinusSrcAlpha = 0,
......
src/common/packed_gl_enums.json
...@@ -130,6 +130,19 @@ ...@@ -130,6 +130,19 @@
"Modulate": "GL_MODULATE", "Modulate": "GL_MODULATE",
"Replace": "GL_REPLACE" "Replace": "GL_REPLACE"
}, },
"TextureEnvTarget":
{
"Env": "GL_TEXTURE_ENV"
},
"TextureEnvParameter":
{
"Mode": "GL_TEXTURE_ENV_MODE",
"Color": "GL_TEXTURE_ENV_COLOR",
"CombineRgb": "GL_COMBINE_RGB",
"CombineAlpha": "GL_COMBINE_ALPHA",
"RgbScale": "GL_RGB_SCALE",
"AlphaScale": "GL_ALPHA_SCALE"
},
"TextureOp": "TextureOp":
{ {
"OneMinusSrcAlpha": "GL_ONE_MINUS_SRC_ALPHA", "OneMinusSrcAlpha": "GL_ONE_MINUS_SRC_ALPHA",
......
src/libANGLE/Context_gles_1_0.cpp
...@@ -224,17 +224,17 @@ void Context::getMaterialxv(GLenum face, MaterialParameter pname, GLfixed *param ...@@ -224,17 +224,17 @@ void Context::getMaterialxv(GLenum face, MaterialParameter pname, GLfixed *param
} }
} }
void Context::getTexEnvfv(GLenum env, GLenum pname, GLfloat *params) void Context::getTexEnvfv(TextureEnvTarget env, TextureEnvParameter pname, GLfloat *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void Context::getTexEnviv(GLenum env, GLenum pname, GLint *params) void Context::getTexEnviv(TextureEnvTarget env, TextureEnvParameter pname, GLint *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void Context::getTexEnvxv(GLenum target, GLenum pname, GLfixed *params) void Context::getTexEnvxv(TextureEnvTarget target, TextureEnvParameter pname, GLfixed *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
...@@ -496,32 +496,32 @@ void Context::texCoordPointer(GLint size, GLenum type, GLsizei stride, const voi ...@@ -496,32 +496,32 @@ void Context::texCoordPointer(GLint size, GLenum type, GLsizei stride, const voi
stride, ptr); stride, ptr);
} }
void Context::texEnvf(GLenum target, GLenum pname, GLfloat param) void Context::texEnvf(TextureEnvTarget target, TextureEnvParameter pname, GLfloat param)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void Context::texEnvfv(GLenum target, GLenum pname, const GLfloat *params) void Context::texEnvfv(TextureEnvTarget target, TextureEnvParameter pname, const GLfloat *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void Context::texEnvi(GLenum target, GLenum pname, GLint param) void Context::texEnvi(TextureEnvTarget target, TextureEnvParameter pname, GLint param)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void Context::texEnviv(GLenum target, GLenum pname, const GLint *params) void Context::texEnviv(TextureEnvTarget target, TextureEnvParameter pname, const GLint *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void Context::texEnvx(GLenum target, GLenum pname, GLfixed param) void Context::texEnvx(TextureEnvTarget target, TextureEnvParameter pname, GLfixed param)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
void Context::texEnvxv(GLenum target, GLenum pname, const GLfixed *params) void Context::texEnvxv(TextureEnvTarget target, TextureEnvParameter pname, const GLfixed *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
......
src/libANGLE/Context_gles_1_0_autogen.h
...@@ -10,120 +10,126 @@ ...@@ -10,120 +10,126 @@
#ifndef ANGLE_CONTEXT_GLES_1_0_AUTOGEN_H_ #ifndef ANGLE_CONTEXT_GLES_1_0_AUTOGEN_H_
#define ANGLE_CONTEXT_GLES_1_0_AUTOGEN_H_ #define ANGLE_CONTEXT_GLES_1_0_AUTOGEN_H_
#define ANGLE_GLES1_CONTEXT_API \ #define ANGLE_GLES1_CONTEXT_API \
void alphaFunc(AlphaTestFunc funcPacked, GLfloat ref); \ void alphaFunc(AlphaTestFunc funcPacked, GLfloat ref); \
void alphaFuncx(AlphaTestFunc funcPacked, GLfixed ref); \ void alphaFuncx(AlphaTestFunc funcPacked, GLfixed ref); \
void clearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); \ void clearColorx(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); \
void clearDepthx(GLfixed depth); \ void clearDepthx(GLfixed depth); \
void clientActiveTexture(GLenum texture); \ void clientActiveTexture(GLenum texture); \
void clipPlanef(GLenum p, const GLfloat *eqn); \ void clipPlanef(GLenum p, const GLfloat *eqn); \
void clipPlanex(GLenum plane, const GLfixed *equation); \ void clipPlanex(GLenum plane, const GLfixed *equation); \
void color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); \ void color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); \
void color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); \ void color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); \
void color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); \ void color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); \
void colorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); \ void colorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); \
void depthRangex(GLfixed n, GLfixed f); \ void depthRangex(GLfixed n, GLfixed f); \
void disableClientState(ClientVertexArrayType arrayPacked); \ void disableClientState(ClientVertexArrayType arrayPacked); \
void enableClientState(ClientVertexArrayType arrayPacked); \ void enableClientState(ClientVertexArrayType arrayPacked); \
void fogf(GLenum pname, GLfloat param); \ void fogf(GLenum pname, GLfloat param); \
void fogfv(GLenum pname, const GLfloat *params); \ void fogfv(GLenum pname, const GLfloat *params); \
void fogx(GLenum pname, GLfixed param); \ void fogx(GLenum pname, GLfixed param); \
void fogxv(GLenum pname, const GLfixed *param); \ void fogxv(GLenum pname, const GLfixed *param); \
void frustumf(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f); \ void frustumf(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f); \
void frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f); \ void frustumx(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f); \
void getClipPlanef(GLenum plane, GLfloat *equation); \ void getClipPlanef(GLenum plane, GLfloat *equation); \
void getClipPlanex(GLenum plane, GLfixed *equation); \ void getClipPlanex(GLenum plane, GLfixed *equation); \
void getFixedv(GLenum pname, GLfixed *params); \ void getFixedv(GLenum pname, GLfixed *params); \
void getLightfv(GLenum light, LightParameter pnamePacked, GLfloat *params); \ void getLightfv(GLenum light, LightParameter pnamePacked, GLfloat *params); \
void getLightxv(GLenum light, LightParameter pnamePacked, GLfixed *params); \ void getLightxv(GLenum light, LightParameter pnamePacked, GLfixed *params); \
void getMaterialfv(GLenum face, MaterialParameter pnamePacked, GLfloat *params); \ void getMaterialfv(GLenum face, MaterialParameter pnamePacked, GLfloat *params); \
void getMaterialxv(GLenum face, MaterialParameter pnamePacked, GLfixed *params); \ void getMaterialxv(GLenum face, MaterialParameter pnamePacked, GLfixed *params); \
void getTexEnvfv(GLenum target, GLenum pname, GLfloat *params); \ void getTexEnvfv(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked, \
void getTexEnviv(GLenum target, GLenum pname, GLint *params); \ GLfloat *params); \
void getTexEnvxv(GLenum target, GLenum pname, GLfixed *params); \ void getTexEnviv(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked, \
void getTexParameterxv(TextureType targetPacked, GLenum pname, GLfixed *params); \ GLint *params); \
void lightModelf(GLenum pname, GLfloat param); \ void getTexEnvxv(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked, \
void lightModelfv(GLenum pname, const GLfloat *params); \ GLfixed *params); \
void lightModelx(GLenum pname, GLfixed param); \ void getTexParameterxv(TextureType targetPacked, GLenum pname, GLfixed *params); \
void lightModelxv(GLenum pname, const GLfixed *param); \ void lightModelf(GLenum pname, GLfloat param); \
void lightf(GLenum light, LightParameter pnamePacked, GLfloat param); \ void lightModelfv(GLenum pname, const GLfloat *params); \
void lightfv(GLenum light, LightParameter pnamePacked, const GLfloat *params); \ void lightModelx(GLenum pname, GLfixed param); \
void lightx(GLenum light, LightParameter pnamePacked, GLfixed param); \ void lightModelxv(GLenum pname, const GLfixed *param); \
void lightxv(GLenum light, LightParameter pnamePacked, const GLfixed *params); \ void lightf(GLenum light, LightParameter pnamePacked, GLfloat param); \
void lineWidthx(GLfixed width); \ void lightfv(GLenum light, LightParameter pnamePacked, const GLfloat *params); \
void loadIdentity(); \ void lightx(GLenum light, LightParameter pnamePacked, GLfixed param); \
void loadMatrixf(const GLfloat *m); \ void lightxv(GLenum light, LightParameter pnamePacked, const GLfixed *params); \
void loadMatrixx(const GLfixed *m); \ void lineWidthx(GLfixed width); \
void logicOp(GLenum opcode); \ void loadIdentity(); \
void materialf(GLenum face, MaterialParameter pnamePacked, GLfloat param); \ void loadMatrixf(const GLfloat *m); \
void materialfv(GLenum face, MaterialParameter pnamePacked, const GLfloat *params); \ void loadMatrixx(const GLfixed *m); \
void materialx(GLenum face, MaterialParameter pnamePacked, GLfixed param); \ void logicOp(GLenum opcode); \
void materialxv(GLenum face, MaterialParameter pnamePacked, const GLfixed *param); \ void materialf(GLenum face, MaterialParameter pnamePacked, GLfloat param); \
void matrixMode(MatrixType modePacked); \ void materialfv(GLenum face, MaterialParameter pnamePacked, const GLfloat *params); \
void multMatrixf(const GLfloat *m); \ void materialx(GLenum face, MaterialParameter pnamePacked, GLfixed param); \
void multMatrixx(const GLfixed *m); \ void materialxv(GLenum face, MaterialParameter pnamePacked, const GLfixed *param); \
void multiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); \ void matrixMode(MatrixType modePacked); \
void multiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q); \ void multMatrixf(const GLfloat *m); \
void normal3f(GLfloat nx, GLfloat ny, GLfloat nz); \ void multMatrixx(const GLfixed *m); \
void normal3x(GLfixed nx, GLfixed ny, GLfixed nz); \ void multiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); \
void normalPointer(GLenum type, GLsizei stride, const void *pointer); \ void multiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q); \
void orthof(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f); \ void normal3f(GLfloat nx, GLfloat ny, GLfloat nz); \
void orthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f); \ void normal3x(GLfixed nx, GLfixed ny, GLfixed nz); \
void pointParameterf(GLenum pname, GLfloat param); \ void normalPointer(GLenum type, GLsizei stride, const void *pointer); \
void pointParameterfv(GLenum pname, const GLfloat *params); \ void orthof(GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f); \
void pointParameterx(GLenum pname, GLfixed param); \ void orthox(GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f); \
void pointParameterxv(GLenum pname, const GLfixed *params); \ void pointParameterf(GLenum pname, GLfloat param); \
void pointSize(GLfloat size); \ void pointParameterfv(GLenum pname, const GLfloat *params); \
void pointSizex(GLfixed size); \ void pointParameterx(GLenum pname, GLfixed param); \
void polygonOffsetx(GLfixed factor, GLfixed units); \ void pointParameterxv(GLenum pname, const GLfixed *params); \
void popMatrix(); \ void pointSize(GLfloat size); \
void pushMatrix(); \ void pointSizex(GLfixed size); \
void rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z); \ void polygonOffsetx(GLfixed factor, GLfixed units); \
void rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); \ void popMatrix(); \
void sampleCoveragex(GLclampx value, GLboolean invert); \ void pushMatrix(); \
void scalef(GLfloat x, GLfloat y, GLfloat z); \ void rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z); \
void scalex(GLfixed x, GLfixed y, GLfixed z); \ void rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); \
void shadeModel(ShadingModel modePacked); \ void sampleCoveragex(GLclampx value, GLboolean invert); \
void texCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); \ void scalef(GLfloat x, GLfloat y, GLfloat z); \
void texEnvf(GLenum target, GLenum pname, GLfloat param); \ void scalex(GLfixed x, GLfixed y, GLfixed z); \
void texEnvfv(GLenum target, GLenum pname, const GLfloat *params); \ void shadeModel(ShadingModel modePacked); \
void texEnvi(GLenum target, GLenum pname, GLint param); \ void texCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); \
void texEnviv(GLenum target, GLenum pname, const GLint *params); \ void texEnvf(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked, GLfloat param); \
void texEnvx(GLenum target, GLenum pname, GLfixed param); \ void texEnvfv(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked, \
void texEnvxv(GLenum target, GLenum pname, const GLfixed *params); \ const GLfloat *params); \
void texParameterx(TextureType targetPacked, GLenum pname, GLfixed param); \ void texEnvi(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked, GLint param); \
void texParameterxv(TextureType targetPacked, GLenum pname, const GLfixed *params); \ void texEnviv(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked, \
void translatef(GLfloat x, GLfloat y, GLfloat z); \ const GLint *params); \
void translatex(GLfixed x, GLfixed y, GLfixed z); \ void texEnvx(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked, GLfixed param); \
void vertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); \ void texEnvxv(TextureEnvTarget targetPacked, TextureEnvParameter pnamePacked, \
/* GL_OES_draw_texture */ \ const GLfixed *params); \
void drawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); \ void texParameterx(TextureType targetPacked, GLenum pname, GLfixed param); \
void drawTexfv(const GLfloat *coords); \ void texParameterxv(TextureType targetPacked, GLenum pname, const GLfixed *params); \
void drawTexi(GLint x, GLint y, GLint z, GLint width, GLint height); \ void translatef(GLfloat x, GLfloat y, GLfloat z); \
void drawTexiv(const GLint *coords); \ void translatex(GLfixed x, GLfixed y, GLfixed z); \
void drawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); \ void vertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); \
void drawTexsv(const GLshort *coords); \ /* GL_OES_draw_texture */ \
void drawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); \ void drawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); \
void drawTexxv(const GLfixed *coords); \ void drawTexfv(const GLfloat *coords); \
/* GL_OES_framebuffer_object */ \ void drawTexi(GLint x, GLint y, GLint z, GLint width, GLint height); \
/* GL_OES_matrix_palette */ \ void drawTexiv(const GLint *coords); \
void currentPaletteMatrix(GLuint matrixpaletteindex); \ void drawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); \
void loadPaletteFromModelViewMatrix(); \ void drawTexsv(const GLshort *coords); \
void matrixIndexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); \ void drawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); \
void weightPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); \ void drawTexxv(const GLfixed *coords); \
/* GL_OES_point_size_array */ \ /* GL_OES_framebuffer_object */ \
void pointSizePointer(GLenum type, GLsizei stride, const void *pointer); \ /* GL_OES_matrix_palette */ \
/* GL_OES_query_matrix */ \ void currentPaletteMatrix(GLuint matrixpaletteindex); \
GLbitfield queryMatrixx(GLfixed *mantissa, GLint *exponent); \ void loadPaletteFromModelViewMatrix(); \
/* GL_OES_texture_cube_map */ \ void matrixIndexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); \
void getTexGenfv(GLenum coord, GLenum pname, GLfloat *params); \ void weightPointer(GLint size, GLenum type, GLsizei stride, const void *pointer); \
void getTexGeniv(GLenum coord, GLenum pname, GLint *params); \ /* GL_OES_point_size_array */ \
void getTexGenxv(GLenum coord, GLenum pname, GLfixed *params); \ void pointSizePointer(GLenum type, GLsizei stride, const void *pointer); \
void texGenf(GLenum coord, GLenum pname, GLfloat param); \ /* GL_OES_query_matrix */ \
void texGenfv(GLenum coord, GLenum pname, const GLfloat *params); \ GLbitfield queryMatrixx(GLfixed *mantissa, GLint *exponent); \
void texGeni(GLenum coord, GLenum pname, GLint param); \ /* GL_OES_texture_cube_map */ \
void texGeniv(GLenum coord, GLenum pname, const GLint *params); \ void getTexGenfv(GLenum coord, GLenum pname, GLfloat *params); \
void texGenx(GLenum coord, GLenum pname, GLfixed param); \ void getTexGeniv(GLenum coord, GLenum pname, GLint *params); \
void getTexGenxv(GLenum coord, GLenum pname, GLfixed *params); \
void texGenf(GLenum coord, GLenum pname, GLfloat param); \
void texGenfv(GLenum coord, GLenum pname, const GLfloat *params); \
void texGeni(GLenum coord, GLenum pname, GLint param); \
void texGeniv(GLenum coord, GLenum pname, const GLint *params); \
void texGenx(GLenum coord, GLenum pname, GLfixed param); \
void texGenxv(GLenum coord, GLenum pname, const GLfixed *params); void texGenxv(GLenum coord, GLenum pname, const GLfixed *params);
#endif // ANGLE_CONTEXT_API_1_0_AUTOGEN_H_ #endif // ANGLE_CONTEXT_API_1_0_AUTOGEN_H_
src/libANGLE/validationES1.cpp
...@@ -587,19 +587,28 @@ bool ValidateGetPointerv(Context *context, GLenum pname, void **params) ...@@ -587,19 +587,28 @@ bool ValidateGetPointerv(Context *context, GLenum pname, void **params)
} }
} }
bool ValidateGetTexEnvfv(Context *context, GLenum target, GLenum pname, GLfloat *params) bool ValidateGetTexEnvfv(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
GLfloat *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
return true; return true;
} }
bool ValidateGetTexEnviv(Context *context, GLenum target, GLenum pname, GLint *params) bool ValidateGetTexEnviv(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
GLint *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
return true; return true;
} }
bool ValidateGetTexEnvxv(Context *context, GLenum target, GLenum pname, GLfixed *params) bool ValidateGetTexEnvxv(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
GLfixed *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
return true; return true;
...@@ -939,37 +948,55 @@ bool ValidateTexCoordPointer(Context *context, ...@@ -939,37 +948,55 @@ bool ValidateTexCoordPointer(Context *context,
type, stride, pointer); type, stride, pointer);
} }
bool ValidateTexEnvf(Context *context, GLenum target, GLenum pname, GLfloat param) bool ValidateTexEnvf(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
GLfloat param)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
return true; return true;
} }
bool ValidateTexEnvfv(Context *context, GLenum target, GLenum pname, const GLfloat *params) bool ValidateTexEnvfv(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
const GLfloat *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
return true; return true;
} }
bool ValidateTexEnvi(Context *context, GLenum target, GLenum pname, GLint param) bool ValidateTexEnvi(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
GLint param)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
return true; return true;
} }
bool ValidateTexEnviv(Context *context, GLenum target, GLenum pname, const GLint *params) bool ValidateTexEnviv(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
const GLint *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
return true; return true;
} }
bool ValidateTexEnvx(Context *context, GLenum target, GLenum pname, GLfixed param) bool ValidateTexEnvx(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
GLfixed param)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
return true; return true;
} }
bool ValidateTexEnvxv(Context *context, GLenum target, GLenum pname, const GLfixed *params) bool ValidateTexEnvxv(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
const GLfixed *params)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
return true; return true;
......
src/libANGLE/validationES1.h
...@@ -64,9 +64,18 @@ bool ValidateGetLightxv(Context *context, GLenum light, LightParameter pname, GL ...@@ -64,9 +64,18 @@ bool ValidateGetLightxv(Context *context, GLenum light, LightParameter pname, GL
bool ValidateGetMaterialfv(Context *context, GLenum face, MaterialParameter pname, GLfloat *params); bool ValidateGetMaterialfv(Context *context, GLenum face, MaterialParameter pname, GLfloat *params);
bool ValidateGetMaterialxv(Context *context, GLenum face, MaterialParameter pname, GLfixed *params); bool ValidateGetMaterialxv(Context *context, GLenum face, MaterialParameter pname, GLfixed *params);
bool ValidateGetPointerv(Context *context, GLenum pname, void **params); bool ValidateGetPointerv(Context *context, GLenum pname, void **params);
bool ValidateGetTexEnvfv(Context *context, GLenum target, GLenum pname, GLfloat *params); bool ValidateGetTexEnvfv(Context *context,
bool ValidateGetTexEnviv(Context *context, GLenum target, GLenum pname, GLint *params); TextureEnvTarget target,
bool ValidateGetTexEnvxv(Context *context, GLenum target, GLenum pname, GLfixed *params); TextureEnvParameter pname,
GLfloat *params);
bool ValidateGetTexEnviv(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
GLint *params);
bool ValidateGetTexEnvxv(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
GLfixed *params);
bool ValidateGetTexParameterxv(Context *context, TextureType target, GLenum pname, GLfixed *params); bool ValidateGetTexParameterxv(Context *context, TextureType target, GLenum pname, GLfixed *params);
bool ValidateLightModelf(Context *context, GLenum pname, GLfloat param); bool ValidateLightModelf(Context *context, GLenum pname, GLfloat param);
bool ValidateLightModelfv(Context *context, GLenum pname, const GLfloat *params); bool ValidateLightModelfv(Context *context, GLenum pname, const GLfloat *params);
...@@ -143,12 +152,30 @@ bool ValidateTexCoordPointer(Context *context, ...@@ -143,12 +152,30 @@ bool ValidateTexCoordPointer(Context *context,
GLenum type, GLenum type,
GLsizei stride, GLsizei stride,
const void *pointer); const void *pointer);
bool ValidateTexEnvf(Context *context, GLenum target, GLenum pname, GLfloat param); bool ValidateTexEnvf(Context *context,
bool ValidateTexEnvfv(Context *context, GLenum target, GLenum pname, const GLfloat *params); TextureEnvTarget target,
bool ValidateTexEnvi(Context *context, GLenum target, GLenum pname, GLint param); TextureEnvParameter pname,
bool ValidateTexEnviv(Context *context, GLenum target, GLenum pname, const GLint *params); GLfloat param);
bool ValidateTexEnvx(Context *context, GLenum target, GLenum pname, GLfixed param); bool ValidateTexEnvfv(Context *context,
bool ValidateTexEnvxv(Context *context, GLenum target, GLenum pname, const GLfixed *params); TextureEnvTarget target,
TextureEnvParameter pname,
const GLfloat *params);
bool ValidateTexEnvi(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
GLint param);
bool ValidateTexEnviv(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
const GLint *params);
bool ValidateTexEnvx(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
GLfixed param);
bool ValidateTexEnvxv(Context *context,
TextureEnvTarget target,
TextureEnvParameter pname,
const GLfixed *params);
bool ValidateTexParameterx(Context *context, TextureType target, GLenum pname, GLfixed param); bool ValidateTexParameterx(Context *context, TextureType target, GLenum pname, GLfixed param);
bool ValidateTexParameterxv(Context *context, bool ValidateTexParameterxv(Context *context,
TextureType target, TextureType target,
......
src/libGLESv2/entry_points_gles_1_0_autogen.cpp
...@@ -496,11 +496,14 @@ void GL_APIENTRY GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params) ...@@ -496,11 +496,14 @@ void GL_APIENTRY GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
{ {
context->gatherParams<EntryPoint::GetTexEnvfv>(target, pname, params); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::GetTexEnvfv>(targetPacked, pnamePacked, params);
if (context->skipValidation() || ValidateGetTexEnvfv(context, target, pname, params)) if (context->skipValidation() ||
ValidateGetTexEnvfv(context, targetPacked, pnamePacked, params))
{ {
context->getTexEnvfv(target, pname, params); context->getTexEnvfv(targetPacked, pnamePacked, params);
} }
} }
} }
...@@ -513,11 +516,14 @@ void GL_APIENTRY GetTexEnviv(GLenum target, GLenum pname, GLint *params) ...@@ -513,11 +516,14 @@ void GL_APIENTRY GetTexEnviv(GLenum target, GLenum pname, GLint *params)
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
{ {
context->gatherParams<EntryPoint::GetTexEnviv>(target, pname, params); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::GetTexEnviv>(targetPacked, pnamePacked, params);
if (context->skipValidation() || ValidateGetTexEnviv(context, target, pname, params)) if (context->skipValidation() ||
ValidateGetTexEnviv(context, targetPacked, pnamePacked, params))
{ {
context->getTexEnviv(target, pname, params); context->getTexEnviv(targetPacked, pnamePacked, params);
} }
} }
} }
...@@ -530,11 +536,14 @@ void GL_APIENTRY GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params) ...@@ -530,11 +536,14 @@ void GL_APIENTRY GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
{ {
context->gatherParams<EntryPoint::GetTexEnvxv>(target, pname, params); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::GetTexEnvxv>(targetPacked, pnamePacked, params);
if (context->skipValidation() || ValidateGetTexEnvxv(context, target, pname, params)) if (context->skipValidation() ||
ValidateGetTexEnvxv(context, targetPacked, pnamePacked, params))
{ {
context->getTexEnvxv(target, pname, params); context->getTexEnvxv(targetPacked, pnamePacked, params);
} }
} }
} }
...@@ -1282,11 +1291,13 @@ void GL_APIENTRY TexEnvf(GLenum target, GLenum pname, GLfloat param) ...@@ -1282,11 +1291,13 @@ void GL_APIENTRY TexEnvf(GLenum target, GLenum pname, GLfloat param)
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
{ {
context->gatherParams<EntryPoint::TexEnvf>(target, pname, param); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::TexEnvf>(targetPacked, pnamePacked, param);
if (context->skipValidation() || ValidateTexEnvf(context, target, pname, param)) if (context->skipValidation() || ValidateTexEnvf(context, targetPacked, pnamePacked, param))
{ {
context->texEnvf(target, pname, param); context->texEnvf(targetPacked, pnamePacked, param);
} }
} }
} }
...@@ -1299,11 +1310,14 @@ void GL_APIENTRY TexEnvfv(GLenum target, GLenum pname, const GLfloat *params) ...@@ -1299,11 +1310,14 @@ void GL_APIENTRY TexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
{ {
context->gatherParams<EntryPoint::TexEnvfv>(target, pname, params); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::TexEnvfv>(targetPacked, pnamePacked, params);
if (context->skipValidation() || ValidateTexEnvfv(context, target, pname, params)) if (context->skipValidation() ||
ValidateTexEnvfv(context, targetPacked, pnamePacked, params))
{ {
context->texEnvfv(target, pname, params); context->texEnvfv(targetPacked, pnamePacked, params);
} }
} }
} }
...@@ -1315,11 +1329,13 @@ void GL_APIENTRY TexEnvi(GLenum target, GLenum pname, GLint param) ...@@ -1315,11 +1329,13 @@ void GL_APIENTRY TexEnvi(GLenum target, GLenum pname, GLint param)
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
{ {
context->gatherParams<EntryPoint::TexEnvi>(target, pname, param); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::TexEnvi>(targetPacked, pnamePacked, param);
if (context->skipValidation() || ValidateTexEnvi(context, target, pname, param)) if (context->skipValidation() || ValidateTexEnvi(context, targetPacked, pnamePacked, param))
{ {
context->texEnvi(target, pname, param); context->texEnvi(targetPacked, pnamePacked, param);
} }
} }
} }
...@@ -1332,11 +1348,14 @@ void GL_APIENTRY TexEnviv(GLenum target, GLenum pname, const GLint *params) ...@@ -1332,11 +1348,14 @@ void GL_APIENTRY TexEnviv(GLenum target, GLenum pname, const GLint *params)
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
{ {
context->gatherParams<EntryPoint::TexEnviv>(target, pname, params); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::TexEnviv>(targetPacked, pnamePacked, params);
if (context->skipValidation() || ValidateTexEnviv(context, target, pname, params)) if (context->skipValidation() ||
ValidateTexEnviv(context, targetPacked, pnamePacked, params))
{ {
context->texEnviv(target, pname, params); context->texEnviv(targetPacked, pnamePacked, params);
} }
} }
} }
...@@ -1349,11 +1368,13 @@ void GL_APIENTRY TexEnvx(GLenum target, GLenum pname, GLfixed param) ...@@ -1349,11 +1368,13 @@ void GL_APIENTRY TexEnvx(GLenum target, GLenum pname, GLfixed param)
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
{ {
context->gatherParams<EntryPoint::TexEnvx>(target, pname, param); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::TexEnvx>(targetPacked, pnamePacked, param);
if (context->skipValidation() || ValidateTexEnvx(context, target, pname, param)) if (context->skipValidation() || ValidateTexEnvx(context, targetPacked, pnamePacked, param))
{ {
context->texEnvx(target, pname, param); context->texEnvx(targetPacked, pnamePacked, param);
} }
} }
} }
...@@ -1366,11 +1387,14 @@ void GL_APIENTRY TexEnvxv(GLenum target, GLenum pname, const GLfixed *params) ...@@ -1366,11 +1387,14 @@ void GL_APIENTRY TexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
Context *context = GetValidGlobalContext(); Context *context = GetValidGlobalContext();
if (context) if (context)
{ {
context->gatherParams<EntryPoint::TexEnvxv>(target, pname, params); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::TexEnvxv>(targetPacked, pnamePacked, params);
if (context->skipValidation() || ValidateTexEnvxv(context, target, pname, params)) if (context->skipValidation() ||
ValidateTexEnvxv(context, targetPacked, pnamePacked, params))
{ {
context->texEnvxv(target, pname, params); context->texEnvxv(targetPacked, pnamePacked, params);
} }
} }
} }
......
src/libGLESv2/entry_points_gles_ext_autogen.cpp
...@@ -9306,11 +9306,14 @@ void GL_APIENTRY GetTexEnvfvContextANGLE(GLeglContext ctx, ...@@ -9306,11 +9306,14 @@ void GL_APIENTRY GetTexEnvfvContextANGLE(GLeglContext ctx,
if (context) if (context)
{ {
ASSERT(context == GetValidGlobalContext()); ASSERT(context == GetValidGlobalContext());
context->gatherParams<EntryPoint::GetTexEnvfv>(target, pname, params); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::GetTexEnvfv>(targetPacked, pnamePacked, params);
if (context->skipValidation() || ValidateGetTexEnvfv(context, target, pname, params)) if (context->skipValidation() ||
ValidateGetTexEnvfv(context, targetPacked, pnamePacked, params))
{ {
context->getTexEnvfv(target, pname, params); context->getTexEnvfv(targetPacked, pnamePacked, params);
} }
} }
} }
...@@ -9327,11 +9330,14 @@ void GL_APIENTRY GetTexEnvivContextANGLE(GLeglContext ctx, ...@@ -9327,11 +9330,14 @@ void GL_APIENTRY GetTexEnvivContextANGLE(GLeglContext ctx,
if (context) if (context)
{ {
ASSERT(context == GetValidGlobalContext()); ASSERT(context == GetValidGlobalContext());
context->gatherParams<EntryPoint::GetTexEnviv>(target, pname, params); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::GetTexEnviv>(targetPacked, pnamePacked, params);
if (context->skipValidation() || ValidateGetTexEnviv(context, target, pname, params)) if (context->skipValidation() ||
ValidateGetTexEnviv(context, targetPacked, pnamePacked, params))
{ {
context->getTexEnviv(target, pname, params); context->getTexEnviv(targetPacked, pnamePacked, params);
} }
} }
} }
...@@ -9348,11 +9354,14 @@ void GL_APIENTRY GetTexEnvxvContextANGLE(GLeglContext ctx, ...@@ -9348,11 +9354,14 @@ void GL_APIENTRY GetTexEnvxvContextANGLE(GLeglContext ctx,
if (context) if (context)
{ {
ASSERT(context == GetValidGlobalContext()); ASSERT(context == GetValidGlobalContext());
context->gatherParams<EntryPoint::GetTexEnvxv>(target, pname, params); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::GetTexEnvxv>(targetPacked, pnamePacked, params);
if (context->skipValidation() || ValidateGetTexEnvxv(context, target, pname, params)) if (context->skipValidation() ||
ValidateGetTexEnvxv(context, targetPacked, pnamePacked, params))
{ {
context->getTexEnvxv(target, pname, params); context->getTexEnvxv(targetPacked, pnamePacked, params);
} }
} }
} }
...@@ -13002,11 +13011,13 @@ void GL_APIENTRY TexEnvfContextANGLE(GLeglContext ctx, GLenum target, GLenum pna ...@@ -13002,11 +13011,13 @@ void GL_APIENTRY TexEnvfContextANGLE(GLeglContext ctx, GLenum target, GLenum pna
if (context) if (context)
{ {
ASSERT(context == GetValidGlobalContext()); ASSERT(context == GetValidGlobalContext());
context->gatherParams<EntryPoint::TexEnvf>(target, pname, param); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::TexEnvf>(targetPacked, pnamePacked, param);
if (context->skipValidation() || ValidateTexEnvf(context, target, pname, param)) if (context->skipValidation() || ValidateTexEnvf(context, targetPacked, pnamePacked, param))
{ {
context->texEnvf(target, pname, param); context->texEnvf(targetPacked, pnamePacked, param);
} }
} }
} }
...@@ -13023,11 +13034,14 @@ void GL_APIENTRY TexEnvfvContextANGLE(GLeglContext ctx, ...@@ -13023,11 +13034,14 @@ void GL_APIENTRY TexEnvfvContextANGLE(GLeglContext ctx,
if (context) if (context)
{ {
ASSERT(context == GetValidGlobalContext()); ASSERT(context == GetValidGlobalContext());
context->gatherParams<EntryPoint::TexEnvfv>(target, pname, params); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::TexEnvfv>(targetPacked, pnamePacked, params);
if (context->skipValidation() || ValidateTexEnvfv(context, target, pname, params)) if (context->skipValidation() ||
ValidateTexEnvfv(context, targetPacked, pnamePacked, params))
{ {
context->texEnvfv(target, pname, params); context->texEnvfv(targetPacked, pnamePacked, params);
} }
} }
} }
...@@ -13040,11 +13054,13 @@ void GL_APIENTRY TexEnviContextANGLE(GLeglContext ctx, GLenum target, GLenum pna ...@@ -13040,11 +13054,13 @@ void GL_APIENTRY TexEnviContextANGLE(GLeglContext ctx, GLenum target, GLenum pna
if (context) if (context)
{ {
ASSERT(context == GetValidGlobalContext()); ASSERT(context == GetValidGlobalContext());
context->gatherParams<EntryPoint::TexEnvi>(target, pname, param); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::TexEnvi>(targetPacked, pnamePacked, param);
if (context->skipValidation() || ValidateTexEnvi(context, target, pname, param)) if (context->skipValidation() || ValidateTexEnvi(context, targetPacked, pnamePacked, param))
{ {
context->texEnvi(target, pname, param); context->texEnvi(targetPacked, pnamePacked, param);
} }
} }
} }
...@@ -13061,11 +13077,14 @@ void GL_APIENTRY TexEnvivContextANGLE(GLeglContext ctx, ...@@ -13061,11 +13077,14 @@ void GL_APIENTRY TexEnvivContextANGLE(GLeglContext ctx,
if (context) if (context)
{ {
ASSERT(context == GetValidGlobalContext()); ASSERT(context == GetValidGlobalContext());
context->gatherParams<EntryPoint::TexEnviv>(target, pname, params); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::TexEnviv>(targetPacked, pnamePacked, params);
if (context->skipValidation() || ValidateTexEnviv(context, target, pname, params)) if (context->skipValidation() ||
ValidateTexEnviv(context, targetPacked, pnamePacked, params))
{ {
context->texEnviv(target, pname, params); context->texEnviv(targetPacked, pnamePacked, params);
} }
} }
} }
...@@ -13079,11 +13098,13 @@ void GL_APIENTRY TexEnvxContextANGLE(GLeglContext ctx, GLenum target, GLenum pna ...@@ -13079,11 +13098,13 @@ void GL_APIENTRY TexEnvxContextANGLE(GLeglContext ctx, GLenum target, GLenum pna
if (context) if (context)
{ {
ASSERT(context == GetValidGlobalContext()); ASSERT(context == GetValidGlobalContext());
context->gatherParams<EntryPoint::TexEnvx>(target, pname, param); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::TexEnvx>(targetPacked, pnamePacked, param);
if (context->skipValidation() || ValidateTexEnvx(context, target, pname, param)) if (context->skipValidation() || ValidateTexEnvx(context, targetPacked, pnamePacked, param))
{ {
context->texEnvx(target, pname, param); context->texEnvx(targetPacked, pnamePacked, param);
} }
} }
} }
...@@ -13100,11 +13121,14 @@ void GL_APIENTRY TexEnvxvContextANGLE(GLeglContext ctx, ...@@ -13100,11 +13121,14 @@ void GL_APIENTRY TexEnvxvContextANGLE(GLeglContext ctx,
if (context) if (context)
{ {
ASSERT(context == GetValidGlobalContext()); ASSERT(context == GetValidGlobalContext());
context->gatherParams<EntryPoint::TexEnvxv>(target, pname, params); TextureEnvTarget targetPacked = FromGLenum<TextureEnvTarget>(target);
TextureEnvParameter pnamePacked = FromGLenum<TextureEnvParameter>(pname);
context->gatherParams<EntryPoint::TexEnvxv>(targetPacked, pnamePacked, params);
if (context->skipValidation() || ValidateTexEnvxv(context, target, pname, params)) if (context->skipValidation() ||
ValidateTexEnvxv(context, targetPacked, pnamePacked, params))
{ {
context->texEnvxv(target, pname, params); context->texEnvxv(targetPacked, pnamePacked, params);
} }
} }
} }
......
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