X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fatifragshader.h;h=0e32795da3b0aeb5f9cc06ba4e80e806415ba28d;hb=bbe2d50b589e0d7b7b63d63814a5271b680164ce;hp=31c335ec8155407543d2fc4ad10c7e90abe5c232;hpb=70c8d29b6bb3214966892d51e6b2befa7040622d;p=mesa.git

diff --git a/src/mesa/main/atifragshader.h b/src/mesa/main/atifragshader.h
index 31c335ec815..0e32795da3b 100644
--- a/src/mesa/main/atifragshader.h
+++ b/src/mesa/main/atifragshader.h
@@ -8,11 +8,15 @@
 #ifndef ATIFRAGSHADER_H
 #define ATIFRAGSHADER_H
 
-#include "main/mtypes.h"
+#include "glheader.h"
+
+
+struct gl_context;
 
 #define MAX_NUM_INSTRUCTIONS_PER_PASS_ATI 8
 #define MAX_NUM_PASSES_ATI                2
 #define MAX_NUM_FRAGMENT_REGISTERS_ATI    6
+#define MAX_NUM_FRAGMENT_CONSTANTS_ATI    8
 
 struct ati_fs_opcode_st
 {
@@ -20,8 +24,6 @@ struct ati_fs_opcode_st
    GLint num_src_args;
 };
 
-extern struct ati_fs_opcode_st ati_fs_opcodes[];
-
 struct atifragshader_src_register
 {
    GLuint Index;
@@ -60,16 +62,11 @@ struct atifs_setupinst
 };
 
 
-#if FEATURE_ATI_fragment_shader
-
-extern void
-_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp);
-
 extern struct ati_fragment_shader *
-_mesa_new_ati_fragment_shader(GLcontext *ctx, GLuint id);
+_mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id);
 
 extern void
-_mesa_delete_ati_fragment_shader(GLcontext *ctx,
+_mesa_delete_ati_fragment_shader(struct gl_context *ctx,
                                  struct ati_fragment_shader *s);
 
 
@@ -125,25 +122,5 @@ _mesa_AlphaFragmentOp3ATI(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1,
 extern void GLAPIENTRY
 _mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value);
 
-#else /* FEATURE_ATI_fragment_shader */
-
-static INLINE void
-_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
-{
-}
-
-static INLINE struct ati_fragment_shader *
-_mesa_new_ati_fragment_shader(GLcontext *ctx, GLuint id)
-{
-   return NULL;
-}
-
-static INLINE void
-_mesa_delete_ati_fragment_shader(GLcontext *ctx,
-                                 struct ati_fragment_shader *s)
-{
-}
-
-#endif /* FEATURE_ATI_fragment_shader */
 
 #endif /* ATIFRAGSHADER_H */