diff options
| author | Dylan Baker <[email protected]> | 2018-09-14 12:57:32 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2020-04-21 11:09:04 -0700 |
| commit | 8e3696137f2cb7b4f5a3824f26186ecbb06f9282 (patch) | |
| tree | 4494df8d138aaf2bab2feafa832f68e9fdf9bfb1 /src/mesa/main/arbprogram.c | |
| parent | 289f02d1d5990e052e21eb250f6d40b47d6eb12f (diff) | |
remove final imports.h and imports.c bits
This moves the fi_types to a new mesa_private.h and removes the
imports.c file. The vast majority of this patch is just removing
pound includes of imports.h and fixing up the recursive includes.
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Kristian H. Kristensen <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3024>
Diffstat (limited to 'src/mesa/main/arbprogram.c')
| -rw-r--r-- | src/mesa/main/arbprogram.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c index 25de173784c..67162946015 100644 --- a/src/mesa/main/arbprogram.c +++ b/src/mesa/main/arbprogram.c @@ -32,7 +32,7 @@ #include "main/glheader.h" #include "main/context.h" #include "main/hash.h" -#include "util/imports.h" + #include "main/macros.h" #include "main/mtypes.h" #include "main/arbprogram.h" @@ -158,7 +158,7 @@ _mesa_BindProgramARB(GLenum target, GLuint id) * \note Not compiled into display lists. * \note Called by both glDeleteProgramsNV and glDeleteProgramsARB. */ -void GLAPIENTRY +void GLAPIENTRY _mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids) { GLint i; @@ -256,7 +256,7 @@ _mesa_GenProgramsARB(GLsizei n, GLuint *ids) GLboolean GLAPIENTRY _mesa_IsProgramARB(GLuint id) { - struct gl_program *prog = NULL; + struct gl_program *prog = NULL; GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); @@ -487,7 +487,7 @@ void GLAPIENTRY _mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) { - _mesa_ProgramEnvParameter4fARB(target, index, (GLfloat) x, (GLfloat) y, + _mesa_ProgramEnvParameter4fARB(target, index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } @@ -500,8 +500,8 @@ void GLAPIENTRY _mesa_ProgramEnvParameter4dvARB(GLenum target, GLuint index, const GLdouble *params) { - _mesa_ProgramEnvParameter4fARB(target, index, (GLfloat) params[0], - (GLfloat) params[1], (GLfloat) params[2], + _mesa_ProgramEnvParameter4fARB(target, index, (GLfloat) params[0], + (GLfloat) params[1], (GLfloat) params[2], (GLfloat) params[3]); } @@ -602,7 +602,7 @@ _mesa_GetProgramEnvParameterdvARB(GLenum target, GLuint index, void GLAPIENTRY -_mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index, +_mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index, GLfloat *params) { GLfloat *param; @@ -746,7 +746,7 @@ _mesa_ProgramLocalParameter4dARB(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) { - _mesa_ProgramLocalParameter4fARB(target, index, (GLfloat) x, (GLfloat) y, + _mesa_ProgramLocalParameter4fARB(target, index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } |