projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: Make _mesa_GetActiveAttribARB use the attributes in the shader IR
[mesa.git]
/
src
/
mesa
/
main
/
atifragshader.h
diff --git
a/src/mesa/main/atifragshader.h
b/src/mesa/main/atifragshader.h
index 31c335ec8155407543d2fc4ad10c7e90abe5c232..90ada212a01d9bc01ad85e63e7aaae16f89127fd 100644
(file)
--- a/
src/mesa/main/atifragshader.h
+++ b/
src/mesa/main/atifragshader.h
@@
-8,7
+8,12
@@
#ifndef ATIFRAGSHADER_H
#define ATIFRAGSHADER_H
#ifndef ATIFRAGSHADER_H
#define ATIFRAGSHADER_H
-#include "main/mtypes.h"
+#include "compiler.h"
+#include "glheader.h"
+#include "mfeatures.h"
+
+struct _glapi_table;
+struct gl_context;
#define MAX_NUM_INSTRUCTIONS_PER_PASS_ATI 8
#define MAX_NUM_PASSES_ATI 2
#define MAX_NUM_INSTRUCTIONS_PER_PASS_ATI 8
#define MAX_NUM_PASSES_ATI 2
@@
-66,10
+71,10
@@
extern void
_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp);
extern struct ati_fragment_shader *
_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp);
extern struct ati_fragment_shader *
-_mesa_new_ati_fragment_shader(
GL
context *ctx, GLuint id);
+_mesa_new_ati_fragment_shader(
struct gl_
context *ctx, GLuint id);
extern void
extern void
-_mesa_delete_ati_fragment_shader(
GL
context *ctx,
+_mesa_delete_ati_fragment_shader(
struct gl_
context *ctx,
struct ati_fragment_shader *s);
struct ati_fragment_shader *s);
@@
-127,19
+132,19
@@
_mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value);
#else /* FEATURE_ATI_fragment_shader */
#else /* FEATURE_ATI_fragment_shader */
-static
INLINE
void
+static
inline
void
_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
{
}
_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
{
}
-static
INLINE
struct ati_fragment_shader *
-_mesa_new_ati_fragment_shader(
GL
context *ctx, GLuint id)
+static
inline
struct ati_fragment_shader *
+_mesa_new_ati_fragment_shader(
struct gl_
context *ctx, GLuint id)
{
return NULL;
}
{
return NULL;
}
-static
INLINE
void
-_mesa_delete_ati_fragment_shader(
GL
context *ctx,
+static
inline
void
+_mesa_delete_ati_fragment_shader(
struct gl_
context *ctx,
struct ati_fragment_shader *s)
{
}
struct ati_fragment_shader *s)
{
}