mesa: rename src/mesa/shader/ to src/mesa/program/

Makefile

@@ -243,9 +243,9 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/mesa/main/descrip.mms				\
 	$(DIRECTORY)/src/mesa/math/*.[ch]				\
 	$(DIRECTORY)/src/mesa/math/descrip.mms				\
-	$(DIRECTORY)/src/mesa/shader/*.[chly]				\
+	$(DIRECTORY)/src/mesa/program/*.[chly]				\
-	$(DIRECTORY)/src/mesa/shader/Makefile				\
+	$(DIRECTORY)/src/mesa/program/Makefile				\
-	$(DIRECTORY)/src/mesa/shader/descrip.mms			\
+	$(DIRECTORY)/src/mesa/program/descrip.mms			\
 	$(DIRECTORY)/src/mesa/slang/*.[ch]				\
 	$(DIRECTORY)/src/mesa/slang/descrip.mms				\
 	$(DIRECTORY)/src/mesa/slang/library/*.gc			\

src/mesa/Makefile.mgw

@@ -216,8 +216,8 @@ clean:
 	-$(call UNLINK,main/*.o)
 	-$(call UNLINK,math/*.o)
 	-$(call UNLINK,vbo/*.o)
-	-$(call UNLINK,shader/*.o)
+	-$(call UNLINK,program/*.o)
-	-$(call UNLINK,shader/slang/*.o)
+	-$(call UNLINK,slang/*.o)
 	-$(call UNLINK,sparc/*.o)
 	-$(call UNLINK,ppc/*.o)
 	-$(call UNLINK,swrast/*.o)

src/mesa/SConscript

@@ -197,27 +197,27 @@ if env['platform'] != 'winddk':
 		'state_tracker/st_texture.c',
 	]
 	
-	shader_sources = [
+	program_sources = [
-		'shader/arbprogparse.c',
+		'program/arbprogparse.c',
-		'shader/hash_table.c',
+		'program/hash_table.c',
-		'shader/lex.yy.c',
+		'program/lex.yy.c',
-		'shader/nvfragparse.c',
+		'program/nvfragparse.c',
-		'shader/nvvertparse.c',
+		'program/nvvertparse.c',
-		'shader/program.c',
+		'program/program.c',
-		'shader/program_parse.tab.c',
+		'program/program_parse.tab.c',
-		'shader/program_parse_extra.c',
+		'program/program_parse_extra.c',
-		'shader/prog_cache.c',
+		'program/prog_cache.c',
-		'shader/prog_execute.c',
+		'program/prog_execute.c',
-		'shader/prog_instruction.c',
+		'program/prog_instruction.c',
-		'shader/prog_noise.c',
+		'program/prog_noise.c',
-		'shader/prog_optimize.c',
+		'program/prog_optimize.c',
-		'shader/prog_parameter.c',
+		'program/prog_parameter.c',
-		'shader/prog_parameter_layout.c',
+		'program/prog_parameter_layout.c',
-		'shader/prog_print.c',
+		'program/prog_print.c',
-		'shader/prog_statevars.c',
+		'program/prog_statevars.c',
-		'shader/prog_uniform.c',
+		'program/prog_uniform.c',
-		'shader/programopt.c',
+		'program/programopt.c',
-		'shader/symbol_table.c',
+		'program/symbol_table.c',
 	]
 	
 	slang_sources = [
@@ -245,10 +245,10 @@ if env['platform'] != 'winddk':
 	mesa_sources = (
 		main_sources +
 		math_sources +
+		program_sources +
 		vbo_sources +
 		vf_sources +
 		statetracker_sources +
-		shader_sources +
 		slang_sources
 	)
 
@@ -327,7 +327,7 @@ if env['platform'] != 'winddk':
 		# build dir) to the include path  
 		env.Append(CPPPATH = [matypes[0].dir])
 
-	SConscript('shader/slang/library/SConscript')
+	SConscript('slang/library/SConscript')
 
 	#
 	# Libraries

src/mesa/drivers/common/driverfuncs.c

@@ -52,7 +52,7 @@
 #include "main/transformfeedback.h"
 #endif
 
-#include "shader/program.h"
+#include "program/program.h"
 #include "tnl/tnl.h"
 #include "swrast/swrast.h"
 

src/mesa/drivers/common/meta.c

@@ -62,7 +62,7 @@
 #include "main/texstate.h"
 #include "main/varray.h"
 #include "main/viewport.h"
-#include "shader/program.h"
+#include "program/program.h"
 #include "swrast/swrast.h"
 #include "drivers/common/meta.h"
 

src/mesa/drivers/dri/common/dri_metaops.c

@@ -34,7 +34,7 @@
 #include "main/texstate.h"
 #include "main/varray.h"
 #include "main/viewport.h"
-#include "shader/program.h"
+#include "program/program.h"
 #include "dri_metaops.h"
 
 void

src/mesa/drivers/dri/i915/i915_fragprog.c

@@ -29,11 +29,11 @@
 #include "main/macros.h"
 #include "main/enums.h"
 
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/programopt.h"
+#include "program/programopt.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
 
 #include "tnl/tnl.h"
 #include "tnl/t_context.h"

src/mesa/drivers/dri/i965/brw_clip_line.c

@@ -32,7 +32,7 @@
 #include "main/glheader.h"
 #include "main/macros.h"
 #include "main/enums.h"
-#include "shader/program.h"
+#include "program/program.h"
 
 #include "intel_batchbuffer.h"
 

src/mesa/drivers/dri/i965/brw_clip_point.c

@@ -32,7 +32,7 @@
 #include "main/glheader.h"
 #include "main/macros.h"
 #include "main/enums.h"
-#include "shader/program.h"
+#include "program/program.h"
 
 #include "intel_batchbuffer.h"
 

src/mesa/drivers/dri/i965/brw_clip_tri.c

@@ -32,7 +32,7 @@
 #include "main/glheader.h"
 #include "main/macros.h"
 #include "main/enums.h"
-#include "shader/program.h"
+#include "program/program.h"
 
 #include "intel_batchbuffer.h"
 

src/mesa/drivers/dri/i965/brw_clip_unfilled.c

@@ -32,7 +32,7 @@
 #include "main/glheader.h"
 #include "main/macros.h"
 #include "main/enums.h"
-#include "shader/program.h"
+#include "program/program.h"
 
 #include "intel_batchbuffer.h"
 

src/mesa/drivers/dri/i965/brw_clip_util.c

@@ -33,7 +33,7 @@
 #include "main/glheader.h"
 #include "main/macros.h"
 #include "main/enums.h"
-#include "shader/program.h"
+#include "program/program.h"
 
 #include "intel_batchbuffer.h"
 

src/mesa/drivers/dri/i965/brw_context.c

@@ -34,7 +34,7 @@
 #include "main/api_noop.h"
 #include "main/macros.h"
 #include "main/simple_list.h"
-#include "shader/shader_api.h"
+#include "program/shader_api.h"
 
 #include "brw_context.h"
 #include "brw_defines.h"

src/mesa/drivers/dri/i965/brw_curbe.c

@@ -35,9 +35,9 @@
 #include "main/context.h"
 #include "main/macros.h"
 #include "main/enums.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
 #include "intel_batchbuffer.h"
 #include "intel_regions.h"
 #include "brw_context.h"

src/mesa/drivers/dri/i965/brw_eu.h

@@ -35,7 +35,7 @@
 
 #include "brw_structs.h"
 #include "brw_defines.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 
 #define BRW_SWIZZLE4(a,b,c,d) (((a)<<0) | ((b)<<2) | ((c)<<4) | ((d)<<6))
 #define BRW_GET_SWZ(swz, idx) (((swz) >> ((idx)*2)) & 0x3)

src/mesa/drivers/dri/i965/brw_gs_emit.c

@@ -34,7 +34,7 @@
 #include "main/macros.h"
 #include "main/enums.h"
 
-#include "shader/program.h"
+#include "program/program.h"
 #include "intel_batchbuffer.h"
 
 #include "brw_defines.h"

src/mesa/drivers/dri/i965/brw_optimize.c

@@ -26,8 +26,8 @@
  */
 
 #include "main/macros.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_eu.h"

src/mesa/drivers/dri/i965/brw_program.c

@@ -31,10 +31,10 @@
   
 #include "main/imports.h"
 #include "main/enums.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/programopt.h"
+#include "program/programopt.h"
-#include "shader/shader_api.h"
+#include "program/shader_api.h"
 #include "tnl/tnl.h"
 
 #include "brw_context.h"

src/mesa/drivers/dri/i965/brw_sf.h

@@ -34,7 +34,7 @@
 #define BRW_SF_H
 
 
-#include "shader/program.h"
+#include "program/program.h"
 #include "brw_context.h"
 #include "brw_eu.h"
 

src/mesa/drivers/dri/i965/brw_util.c

@@ -31,7 +31,7 @@
          
 
 #include "main/mtypes.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
 #include "brw_util.h"
 #include "brw_defines.h"
 

src/mesa/drivers/dri/i965/brw_vs.c

@@ -34,8 +34,8 @@
 #include "brw_vs.h"
 #include "brw_util.h"
 #include "brw_state.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
 
 
 

src/mesa/drivers/dri/i965/brw_vs.h

@@ -36,7 +36,7 @@
 
 #include "brw_context.h"
 #include "brw_eu.h"
-#include "shader/program.h"
+#include "program/program.h"
 
 
 struct brw_vs_prog_key {

src/mesa/drivers/dri/i965/brw_vs_emit.c

@@ -31,9 +31,9 @@
             
 
 #include "main/macros.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
 #include "brw_context.h"
 #include "brw_vs.h"
 

src/mesa/drivers/dri/i965/brw_vs_surface_state.c

@@ -31,7 +31,7 @@
 
 #include "main/mtypes.h"
 #include "main/texstore.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
 
 #include "brw_context.h"
 #include "brw_state.h"

src/mesa/drivers/dri/i965/brw_wm.h

@@ -34,7 +34,7 @@
 #define BRW_WM_H
 
 
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 #include "brw_context.h"
 #include "brw_eu.h"
 

src/mesa/drivers/dri/i965/brw_wm_fp.c

@@ -37,9 +37,9 @@
 #include "brw_wm.h"
 #include "brw_util.h"
 
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
 
 
 /** An invalid texture target */

src/mesa/drivers/dri/i965/brw_wm_glsl.c

@@ -1,7 +1,7 @@
 #include "main/macros.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
-#include "shader/prog_optimize.h"
+#include "program/prog_optimize.h"
 #include "brw_context.h"
 #include "brw_eu.h"
 #include "brw_wm.h"

src/mesa/drivers/dri/i965/brw_wm_pass0.c

@@ -32,7 +32,7 @@
 
 #include "brw_context.h"
 #include "brw_wm.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
 
 
 

src/mesa/drivers/dri/i965/brw_wm_surface_state.c

@@ -32,7 +32,7 @@
 
 #include "main/mtypes.h"
 #include "main/texstore.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
 
 #include "intel_mipmap_tree.h"
 #include "intel_batchbuffer.h"

src/mesa/drivers/dri/i965/gen6_vs_state.c

@@ -29,8 +29,8 @@
 #include "brw_state.h"
 #include "brw_defines.h"
 #include "brw_util.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
 #include "intel_batchbuffer.h"
 
 static void

src/mesa/drivers/dri/i965/gen6_wm_state.c

@@ -29,8 +29,8 @@
 #include "brw_state.h"
 #include "brw_defines.h"
 #include "brw_util.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
 #include "intel_batchbuffer.h"
 
 static void

src/mesa/drivers/dri/r200/r200_fragshader.c

@@ -30,7 +30,7 @@
 #include "main/macros.h"
 #include "main/enums.h"
 #include "tnl/t_context.h"
-#include "shader/program.h"
+#include "program/program.h"
 #include "r200_context.h"
 #include "r200_ioctl.h"
 #include "r200_tex.h"

src/mesa/drivers/dri/r200/r200_vertprog.c

@@ -33,11 +33,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/glheader.h"
 #include "main/macros.h"
 #include "main/enums.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
-#include "shader/programopt.h"
+#include "program/programopt.h"
 #include "tnl/tnl.h"
 
 #include "r200_context.h"

src/mesa/drivers/dri/r300/r300_context.h

@@ -43,7 +43,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "radeon_common.h"
 
 #include "main/mtypes.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 #include "compiler/radeon_code.h"
 
 struct r300_context;

src/mesa/drivers/dri/r300/r300_fragprog_common.c

@@ -38,8 +38,8 @@
 
 #include "r300_fragprog_common.h"
 
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
 
 #include "compiler/radeon_compiler.h"
 

src/mesa/drivers/dri/r300/r300_shader.c

@@ -27,7 +27,7 @@
 
 #include "main/glheader.h"
 
-#include "shader/program.h"
+#include "program/program.h"
 #include "tnl/tnl.h"
 #include "r300_context.h"
 #include "r300_fragprog_common.h"

src/mesa/drivers/dri/r300/r300_state.c

@@ -49,8 +49,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "drivers/common/meta.h"
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
 #include "vbo/vbo.h"
 #include "tnl/tnl.h"
 

src/mesa/drivers/dri/r300/r300_vertprog.c

@@ -31,12 +31,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/glheader.h"
 #include "main/macros.h"
 #include "main/enums.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/programopt.h"
+#include "program/programopt.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
 #include "tnl/tnl.h"
 
 #include "compiler/radeon_compiler.h"

src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c

@@ -28,8 +28,8 @@
 #include "radeon_mesa_to_rc.h"
 
 #include "main/mtypes.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
 
 #include "compiler/radeon_compiler.h"
 #include "compiler/radeon_program.h"

src/mesa/drivers/dri/r600/r700_assembler.c

@@ -32,7 +32,7 @@
 
 #include "main/mtypes.h"
 #include "main/imports.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
 
 #include "radeon_debug.h"
 #include "r600_context.h"

src/mesa/drivers/dri/r600/r700_assembler.h

@@ -28,7 +28,7 @@
 #define _R700_ASSEMBLER_H_
 
 #include "main/mtypes.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 
 #include "r700_chip.h"
 #include "r700_shaderinst.h"

src/mesa/drivers/dri/r600/r700_fragprog.c

@@ -32,9 +32,9 @@
 #include <math.h>
 
 #include "main/imports.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
-#include "shader/program.h"
+#include "program/program.h"
 
 #include "r600_context.h"
 #include "r600_cmdbuf.h"

src/mesa/drivers/dri/r600/r700_oglprog.c

@@ -29,7 +29,7 @@
 #include "main/glheader.h"
 #include "main/imports.h"
 
-#include "shader/program.h"
+#include "program/program.h"
 #include "tnl/tnl.h"
 
 #include "r600_context.h"

src/mesa/drivers/dri/r600/r700_state.c

@@ -41,8 +41,8 @@
 #include "main/framebuffer.h"
 #include "drivers/common/meta.h"
 
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
 #include "vbo/vbo.h"
 
 #include "r600_context.h"

src/mesa/drivers/dri/r600/r700_vertprog.c

@@ -35,14 +35,14 @@
 #include "main/mtypes.h"
 
 #include "tnl/t_context.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
 
 #include "radeon_debug.h"
 #include "r600_context.h"
 #include "r600_cmdbuf.h"
-#include "shader/programopt.h"
+#include "program/programopt.h"
 
 #include "r700_debug.h"
 #include "r700_vertprog.h"

src/mesa/drivers/glslcompiler/glslcompiler.c

@@ -50,8 +50,8 @@
 #include "main/extensions.h"
 #include "main/framebuffer.h"
 #include "main/shaders.h"
-#include "shader/shader_api.h"
+#include "program/shader_api.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
 #include "drivers/common/driverfuncs.h"
 #include "tnl/tnl.h"
 #include "tnl/t_context.h"

src/mesa/main/arbprogram.c

@@ -36,10 +36,10 @@
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "main/arbprogram.h"
-#include "shader/arbprogparse.h"
+#include "program/arbprogparse.h"
-#include "shader/nvfragparse.h"
+#include "program/nvfragparse.h"
-#include "shader/nvvertparse.h"
+#include "program/nvvertparse.h"
-#include "shader/program.h"
+#include "program/program.h"
 
 
 

src/mesa/main/context.c

@@ -130,8 +130,8 @@
 #include "version.h"
 #include "viewport.h"
 #include "vtxfmt.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
 #if _HAVE_FULL_GL
 #include "math/m_matrix.h"
 #endif

src/mesa/main/ffvertex_prog.c

@@ -38,12 +38,12 @@
 #include "main/macros.h"
 #include "main/enums.h"
 #include "main/ffvertex_prog.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_cache.h"
+#include "program/prog_cache.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
 
 
 /** Max of number of lights and texture coord units */

src/mesa/main/get.c

@@ -667,7 +667,7 @@ static const struct value_desc values[] = {
    { GL_MAX_3D_TEXTURE_SIZE, LOC_CUSTOM, TYPE_INT,
      offsetof(GLcontext, Const.Max3DTextureLevels), NO_EXTRA },
 
-   /* GL_ARB_fragment_shader/OES_standard_derivatives */
+   /* GL_ARB_fragment_program/OES_standard_derivatives */
    { GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB,
      CONTEXT_ENUM(Hint.FragmentShaderDerivative), extra_ARB_fragment_shader },
 #endif /* FEATURE_GL || FEATURE_ES2 */

src/mesa/main/nvprogram.c

@@ -43,12 +43,12 @@
 #include "main/imports.h"
 #include "main/macros.h"
 #include "main/nvprogram.h"
-#include "shader/arbprogparse.h"
+#include "program/arbprogparse.h"
-#include "shader/nvfragparse.h"
+#include "program/nvfragparse.h"
-#include "shader/nvvertparse.h"
+#include "program/nvvertparse.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
 
 
 

src/mesa/main/shaderapi.c

@@ -42,9 +42,9 @@
 #include "main/hash.h"
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_uniform.h"
+#include "program/prog_uniform.h"
 #include "slang/slang_compile.h"
 #include "slang/slang_link.h"
 

src/mesa/main/shaderobj.c

@@ -34,9 +34,9 @@
 #include "main/dispatch.h"
 #include "main/hash.h"
 #include "main/shaderobj.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_uniform.h"
+#include "program/prog_uniform.h"
 
 
 /**********************************************************************/

src/mesa/main/shared.c

@@ -38,7 +38,7 @@
 #endif
 #include "bufferobj.h"
 #include "shared.h"
-#include "shader/program.h"
+#include "program/program.h"
 #include "dlist.h"
 #include "shaderobj.h"
 #if FEATURE_ARB_sync

src/mesa/main/state.c

@@ -41,8 +41,8 @@
 #include "light.h"
 #include "matrix.h"
 #include "pixel.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
 #include "state.h"
 #include "stencil.h"
 #include "texenvprogram.h"

src/mesa/main/texenvprogram.c

@@ -28,13 +28,13 @@
 
 #include "glheader.h"
 #include "imports.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_cache.h"
+#include "program/prog_cache.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
-#include "shader/prog_print.h"
+#include "program/prog_print.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
-#include "shader/programopt.h"
+#include "program/programopt.h"
 #include "texenvprogram.h"
 
 

src/mesa/main/texobj.c

@@ -40,7 +40,7 @@
 #include "teximage.h"
 #include "texobj.h"
 #include "mtypes.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 
 
 

src/mesa/main/texparam.c

@@ -39,7 +39,7 @@
 #include "main/texparam.h"
 #include "main/teximage.h"
 #include "main/texstate.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 
 
 /**

src/mesa/main/texstate.c

@@ -528,7 +528,7 @@ update_texture_state( GLcontext *ctx )
       /* Get the bitmask of texture target enables.
        * enableBits will be a mask of the TEXTURE_*_BIT flags indicating
        * which texture targets are enabled (fixed function) or referenced
-       * by a fragment shader/program.  When multiple flags are set, we'll
+       * by a fragment program/program.  When multiple flags are set, we'll
        * settle on the one with highest priority (see below).
        */
       if (vprog) {

src/mesa/main/transformfeedback.c

@@ -39,8 +39,8 @@
 #include "shaderobj.h"
 #include "main/dispatch.h"
 
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-//#include "shader/shader_api.h"
+//#include "program/shader_api.h"
 
 
 #if FEATURE_EXT_transform_feedback

src/mesa/main/uniforms.c

@@ -41,9 +41,9 @@
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
 #include "main/uniforms.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
-#include "shader/prog_uniform.h"
+#include "program/prog_uniform.h"
 
 
 

src/mesa/program/prog_cache.c

@@ -29,8 +29,8 @@
 #include "main/glheader.h"
 #include "main/mtypes.h"
 #include "main/imports.h"
-#include "shader/prog_cache.h"
+#include "program/prog_cache.h"
-#include "shader/program.h"
+#include "program/program.h"
 
 
 struct cache_item

src/mesa/program/program_lexer.l

@@ -23,12 +23,11 @@
  */
 #include "main/glheader.h"
 #include "main/imports.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
-
+#include "program/symbol_table.h"
-#include "shader/symbol_table.h"
+#include "program/program_parser.h"
-#include "shader/program_parser.h"
+#include "program/program_parse.tab.h"
-#include "shader/program_parse.tab.h"
 
 #define require_ARB_vp (yyextra->mode == ARB_vertex)
 #define require_ARB_fp (yyextra->mode == ARB_fragment)

src/mesa/program/program_parse.tab.c

@@ -98,14 +98,14 @@
 
 #include "main/mtypes.h"
 #include "main/imports.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_parameter_layout.h"
+#include "program/prog_parameter_layout.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 
-#include "shader/symbol_table.h"
+#include "program/symbol_table.h"
-#include "shader/program_parser.h"
+#include "program/program_parser.h"
 
 extern void *yy_scan_string(char *);
 extern void yy_delete_buffer(void *);

src/mesa/program/program_parse.y

@@ -27,14 +27,14 @@
 
 #include "main/mtypes.h"
 #include "main/imports.h"
-#include "shader/program.h"
+#include "program/program.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
-#include "shader/prog_parameter_layout.h"
+#include "program/prog_parameter_layout.h"
-#include "shader/prog_statevars.h"
+#include "program/prog_statevars.h"
-#include "shader/prog_instruction.h"
+#include "program/prog_instruction.h"
 
-#include "shader/symbol_table.h"
+#include "program/symbol_table.h"
-#include "shader/program_parser.h"
+#include "program/program_parser.h"
 
 extern void *yy_scan_string(char *);
 extern void yy_delete_buffer(void *);