From: Brian Paul Date: Thu, 24 Jun 2010 04:30:26 +0000 (-0600) Subject: Merge branch 'shader-file-reorg' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca12aefdacd22fb42e3f1d3852db4c12de886554;p=mesa.git Merge branch 'shader-file-reorg' 1. Move all GL entrypoint functions and files into src/mesa/main/ This includes the ARB vp/vp, NV vp/fp, ATI fragshader and GLSL bits that were in src/mesa/shader/ 2. Move src/mesa/shader/slang/ to src/mesa/slang/ to reduce the tree depth 3. Rename src/mesa/shader/ to src/mesa/program/ since all the remaining files are concerned with GPU programs. 4. Misc code refactoring. In particular, I got rid of most of the GLSL-related ctx->Driver hook functions. None of the drivers used them. Conflicts: src/mesa/drivers/dri/i965/brw_context.c --- ca12aefdacd22fb42e3f1d3852db4c12de886554 diff --cc src/mesa/drivers/dri/i965/brw_context.c index d13b9ae298b,e688431b126..6d064b822e5 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@@ -34,7 -34,8 +34,6 @@@ #include "main/api_noop.h" #include "main/macros.h" #include "main/simple_list.h" -#include "program/shader_api.h" -- #include "brw_context.h" #include "brw_defines.h" #include "brw_draw.h" diff --cc src/mesa/drivers/dri/i965/brw_program.c index bd560acdadf,cc9ac6d5749..aeed24d4e14 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@@ -31,10 -31,10 +31,10 @@@ #include "main/imports.h" #include "main/enums.h" - #include "shader/prog_parameter.h" - #include "shader/program.h" - #include "shader/programopt.h" - #include "shader/shader_api.h" ++#include "main/shaderobj.h" + #include "program/prog_parameter.h" + #include "program/program.h" + #include "program/programopt.h" -#include "program/shader_api.h" #include "tnl/tnl.h" #include "brw_context.h" diff --cc src/mesa/main/arbprogram.h index 00000000000,df16513e398..787ffd62f4b mode 000000,100644..100644 --- a/src/mesa/main/arbprogram.h +++ b/src/mesa/main/arbprogram.h @@@ -1,0 -1,128 +1,132 @@@ + /* + * Mesa 3-D graphics library + * Version: 6.5.2 + * + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + + #ifndef ARBPROGRAM_H + #define ARBPROGRAM_H + + ++#include "compiler.h" ++#include "glheader.h" ++ ++ + extern void GLAPIENTRY + _mesa_BindProgram(GLenum target, GLuint id); + + extern void GLAPIENTRY + _mesa_DeletePrograms(GLsizei n, const GLuint *ids); + + extern void GLAPIENTRY + _mesa_GenPrograms(GLsizei n, GLuint *ids); + + + extern GLboolean GLAPIENTRY + _mesa_IsProgramARB(GLuint id); + + + extern void GLAPIENTRY + _mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len, + const GLvoid *string); + + + extern void GLAPIENTRY + _mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index, + GLdouble x, GLdouble y, GLdouble z, GLdouble w); + + + extern void GLAPIENTRY + _mesa_ProgramEnvParameter4dvARB(GLenum target, GLuint index, + const GLdouble *params); + + + extern void GLAPIENTRY + _mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index, + GLfloat x, GLfloat y, GLfloat z, GLfloat w); + + + extern void GLAPIENTRY + _mesa_ProgramEnvParameter4fvARB(GLenum target, GLuint index, + const GLfloat *params); + + + extern void GLAPIENTRY + _mesa_ProgramEnvParameters4fvEXT(GLenum target, GLuint index, GLsizei count, + const GLfloat *params); + + + extern void GLAPIENTRY + _mesa_ProgramLocalParameter4dARB(GLenum target, GLuint index, + GLdouble x, GLdouble y, + GLdouble z, GLdouble w); + + + extern void GLAPIENTRY + _mesa_ProgramLocalParameter4dvARB(GLenum target, GLuint index, + const GLdouble *params); + + + extern void GLAPIENTRY + _mesa_ProgramLocalParameter4fARB(GLenum target, GLuint index, + GLfloat x, GLfloat y, GLfloat z, GLfloat w); + + + extern void GLAPIENTRY + _mesa_ProgramLocalParameter4fvARB(GLenum target, GLuint index, + const GLfloat *params); + + + extern void GLAPIENTRY + _mesa_ProgramLocalParameters4fvEXT(GLenum target, GLuint index, GLsizei count, + const GLfloat *params); + + + extern void GLAPIENTRY + _mesa_GetProgramEnvParameterdvARB(GLenum target, GLuint index, + GLdouble *params); + + + extern void GLAPIENTRY + _mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index, + GLfloat *params); + + + extern void GLAPIENTRY + _mesa_GetProgramLocalParameterdvARB(GLenum target, GLuint index, + GLdouble *params); + + + extern void GLAPIENTRY + _mesa_GetProgramLocalParameterfvARB(GLenum target, GLuint index, + GLfloat *params); + + + extern void GLAPIENTRY + _mesa_GetProgramivARB(GLenum target, GLenum pname, GLint *params); + + + extern void GLAPIENTRY + _mesa_GetProgramStringARB(GLenum target, GLenum pname, GLvoid *string); + + + #endif