dispatch: Remove a few FEATURE_ES1 conditionals.
This allows the GLES1.1 dispatch sanity test to be run on all builds, even builds that do not include GLES1 support. Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
@@ -870,7 +870,6 @@ _mesa_create_exec_table(struct gl_context *ctx)
|
||||
SET_InvalidateFramebuffer(exec, _mesa_InvalidateFramebuffer);
|
||||
}
|
||||
|
||||
#if FEATURE_ES1
|
||||
if (ctx->API == API_OPENGLES) {
|
||||
SET_AlphaFuncxOES(exec, _es_AlphaFuncx);
|
||||
SET_ClearColorxOES(exec, _es_ClearColorx);
|
||||
@@ -929,7 +928,6 @@ _mesa_create_exec_table(struct gl_context *ctx)
|
||||
SET_TexParameterxvOES(exec, _es_TexParameterxv);
|
||||
SET_TranslatexOES(exec, _es_Translatex);
|
||||
}
|
||||
#endif
|
||||
|
||||
return exec;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#include <stdbool.h>
|
||||
#include "main/mfeatures.h"
|
||||
|
||||
#if FEATURE_ES1
|
||||
|
||||
#include "api_loopback.h"
|
||||
#include "api_exec.h"
|
||||
#include "blend.h"
|
||||
@@ -938,5 +936,3 @@ _es_Translatex(GLfixed x, GLfixed y, GLfixed z)
|
||||
(GLfloat) (y / 65536.0f),
|
||||
(GLfloat) (z / 65536.0f));
|
||||
}
|
||||
|
||||
#endif /* FEATURE_ES1 */
|
||||
|
||||
@@ -1686,7 +1686,6 @@ _mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params )
|
||||
}
|
||||
}
|
||||
|
||||
#if FEATURE_ES1
|
||||
void GLAPIENTRY
|
||||
_mesa_GetFixedv(GLenum pname, GLfixed *params)
|
||||
{
|
||||
@@ -1772,4 +1771,3 @@ _mesa_GetFixedv(GLenum pname, GLfixed *params)
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -74,13 +74,10 @@ struct function {
|
||||
};
|
||||
|
||||
extern const struct function gl_core_functions_possible[];
|
||||
extern const struct function gles11_functions_possible[];
|
||||
extern const struct function gles2_functions_possible[];
|
||||
extern const struct function gles3_functions_possible[];
|
||||
|
||||
#if FEATURE_ES1
|
||||
extern const struct function gles11_functions_possible[];
|
||||
#endif /* FEATURE_ES1 */
|
||||
|
||||
class DispatchSanity_test : public ::testing::Test {
|
||||
public:
|
||||
virtual void SetUp();
|
||||
@@ -177,14 +174,12 @@ TEST_F(DispatchSanity_test, GL31_CORE)
|
||||
validate_nops(&ctx);
|
||||
}
|
||||
|
||||
#if FEATURE_ES1
|
||||
TEST_F(DispatchSanity_test, GLES11)
|
||||
{
|
||||
SetUpCtx(API_OPENGLES, 11);
|
||||
validate_functions(&ctx, gles11_functions_possible);
|
||||
validate_nops(&ctx);
|
||||
}
|
||||
#endif /* FEATURE_ES1 */
|
||||
|
||||
TEST_F(DispatchSanity_test, GLES2)
|
||||
{
|
||||
@@ -898,7 +893,6 @@ const struct function gl_core_functions_possible[] = {
|
||||
{ NULL, 0, -1 }
|
||||
};
|
||||
|
||||
#if FEATURE_ES1
|
||||
const struct function gles11_functions_possible[] = {
|
||||
{ "glActiveTexture", 11, _gloffset_ActiveTextureARB },
|
||||
{ "glAlphaFunc", 11, _gloffset_AlphaFunc },
|
||||
@@ -1092,7 +1086,6 @@ const struct function gles11_functions_possible[] = {
|
||||
{ "glViewport", 11, _gloffset_Viewport },
|
||||
{ NULL, 0, -1 }
|
||||
};
|
||||
#endif /* FEATURE_ES1 */
|
||||
|
||||
const struct function gles2_functions_possible[] = {
|
||||
{ "glActiveTexture", 20, _gloffset_ActiveTextureARB },
|
||||
|
||||
@@ -212,7 +212,6 @@ _mesa_TexGend(GLenum coord, GLenum pname, GLdouble param )
|
||||
_mesa_TexGenfv( coord, pname, p );
|
||||
}
|
||||
|
||||
#if FEATURE_ES1
|
||||
|
||||
void GLAPIENTRY
|
||||
_es_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
|
||||
@@ -250,7 +249,6 @@ _es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
|
||||
_mesa_TexGenfv(GL_R, pname, params);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static void GLAPIENTRY
|
||||
_mesa_TexGendv(GLenum coord, GLenum pname, const GLdouble *params )
|
||||
|
||||
Reference in New Issue
Block a user