summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/api_exec.c
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2010-05-12 13:26:14 +0800
committerChia-I Wu <[email protected]>2010-05-12 13:46:53 +0800
commiteb5100accc888b9a9cfc24bc3d3452ea62a84c09 (patch)
treeeafafda093057cc3cc345c10e3b3566dcaa0d79c /src/mesa/main/api_exec.c
parent82c6c31f55cfa8db63361b174137b2a371aa4900 (diff)
mesa: Make FEATURE_ATI_fragment_shader more modular.
This allows atifragshader.h to be used without knowing if FEATURE_ATI_fragment_shader is enabled. As a result, atifragshader.c is removed from the omit list in ES overlay.
Diffstat (limited to 'src/mesa/main/api_exec.c')
-rw-r--r--src/mesa/main/api_exec.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index ad18472dea3..7bd6e328132 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -36,9 +36,7 @@
#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
#include "shader/arbprogram.h"
#endif
-#if FEATURE_ATI_fragment_shader
#include "shader/atifragshader.h"
-#endif
#include "attrib.h"
#include "blend.h"
#if FEATURE_ARB_vertex_buffer_object
@@ -715,22 +713,7 @@ _mesa_create_exec_table(void)
#endif
/* GL_ATI_fragment_shader */
-#if FEATURE_ATI_fragment_shader
- SET_GenFragmentShadersATI(exec, _mesa_GenFragmentShadersATI);
- SET_BindFragmentShaderATI(exec, _mesa_BindFragmentShaderATI);
- SET_DeleteFragmentShaderATI(exec, _mesa_DeleteFragmentShaderATI);
- SET_BeginFragmentShaderATI(exec, _mesa_BeginFragmentShaderATI);
- SET_EndFragmentShaderATI(exec, _mesa_EndFragmentShaderATI);
- SET_PassTexCoordATI(exec, _mesa_PassTexCoordATI);
- SET_SampleMapATI(exec, _mesa_SampleMapATI);
- SET_ColorFragmentOp1ATI(exec, _mesa_ColorFragmentOp1ATI);
- SET_ColorFragmentOp2ATI(exec, _mesa_ColorFragmentOp2ATI);
- SET_ColorFragmentOp3ATI(exec, _mesa_ColorFragmentOp3ATI);
- SET_AlphaFragmentOp1ATI(exec, _mesa_AlphaFragmentOp1ATI);
- SET_AlphaFragmentOp2ATI(exec, _mesa_AlphaFragmentOp2ATI);
- SET_AlphaFragmentOp3ATI(exec, _mesa_AlphaFragmentOp3ATI);
- SET_SetFragmentShaderConstantATI(exec, _mesa_SetFragmentShaderConstantATI);
-#endif
+ _mesa_init_ati_fragment_shader_dispatch(exec);
/* GL_ATI_envmap_bumpmap */
SET_GetTexBumpParameterivATI(exec, _mesa_GetTexBumpParameterivATI);