mesa: rename src/mesa/shader/ to src/mesa/program/
This commit is contained in:
parent
f1c5043f94
commit
ec2b92f98c
6
Makefile
6
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/shader/Makefile \
|
||||
$(DIRECTORY)/src/mesa/shader/descrip.mms \
|
||||
$(DIRECTORY)/src/mesa/program/*.[chly] \
|
||||
$(DIRECTORY)/src/mesa/program/Makefile \
|
||||
$(DIRECTORY)/src/mesa/program/descrip.mms \
|
||||
$(DIRECTORY)/src/mesa/slang/*.[ch] \
|
||||
$(DIRECTORY)/src/mesa/slang/descrip.mms \
|
||||
$(DIRECTORY)/src/mesa/slang/library/*.gc \
|
||||
|
|
|
@ -216,8 +216,8 @@ clean:
|
|||
-$(call UNLINK,main/*.o)
|
||||
-$(call UNLINK,math/*.o)
|
||||
-$(call UNLINK,vbo/*.o)
|
||||
-$(call UNLINK,shader/*.o)
|
||||
-$(call UNLINK,shader/slang/*.o)
|
||||
-$(call UNLINK,program/*.o)
|
||||
-$(call UNLINK,slang/*.o)
|
||||
-$(call UNLINK,sparc/*.o)
|
||||
-$(call UNLINK,ppc/*.o)
|
||||
-$(call UNLINK,swrast/*.o)
|
||||
|
|
|
@ -197,27 +197,27 @@ if env['platform'] != 'winddk':
|
|||
'state_tracker/st_texture.c',
|
||||
]
|
||||
|
||||
shader_sources = [
|
||||
'shader/arbprogparse.c',
|
||||
'shader/hash_table.c',
|
||||
'shader/lex.yy.c',
|
||||
'shader/nvfragparse.c',
|
||||
'shader/nvvertparse.c',
|
||||
'shader/program.c',
|
||||
'shader/program_parse.tab.c',
|
||||
'shader/program_parse_extra.c',
|
||||
'shader/prog_cache.c',
|
||||
'shader/prog_execute.c',
|
||||
'shader/prog_instruction.c',
|
||||
'shader/prog_noise.c',
|
||||
'shader/prog_optimize.c',
|
||||
'shader/prog_parameter.c',
|
||||
'shader/prog_parameter_layout.c',
|
||||
'shader/prog_print.c',
|
||||
'shader/prog_statevars.c',
|
||||
'shader/prog_uniform.c',
|
||||
'shader/programopt.c',
|
||||
'shader/symbol_table.c',
|
||||
program_sources = [
|
||||
'program/arbprogparse.c',
|
||||
'program/hash_table.c',
|
||||
'program/lex.yy.c',
|
||||
'program/nvfragparse.c',
|
||||
'program/nvvertparse.c',
|
||||
'program/program.c',
|
||||
'program/program_parse.tab.c',
|
||||
'program/program_parse_extra.c',
|
||||
'program/prog_cache.c',
|
||||
'program/prog_execute.c',
|
||||
'program/prog_instruction.c',
|
||||
'program/prog_noise.c',
|
||||
'program/prog_optimize.c',
|
||||
'program/prog_parameter.c',
|
||||
'program/prog_parameter_layout.c',
|
||||
'program/prog_print.c',
|
||||
'program/prog_statevars.c',
|
||||
'program/prog_uniform.c',
|
||||
'program/programopt.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
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -29,11 +29,11 @@
|
|||
#include "main/macros.h"
|
||||
#include "main/enums.h"
|
||||
|
||||
#include "shader/prog_instruction.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/programopt.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "program/prog_instruction.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/program.h"
|
||||
#include "program/programopt.h"
|
||||
#include "program/prog_print.h"
|
||||
|
||||
#include "tnl/tnl.h"
|
||||
#include "tnl/t_context.h"
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -35,9 +35,9 @@
|
|||
#include "main/context.h"
|
||||
#include "main/macros.h"
|
||||
#include "main/enums.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_print.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "intel_batchbuffer.h"
|
||||
#include "intel_regions.h"
|
||||
#include "brw_context.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)
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -26,8 +26,8 @@
|
|||
*/
|
||||
|
||||
#include "main/macros.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_print.h"
|
||||
#include "brw_context.h"
|
||||
#include "brw_defines.h"
|
||||
#include "brw_eu.h"
|
||||
|
|
|
@ -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 "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"
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
#define BRW_SF_H
|
||||
|
||||
|
||||
#include "shader/program.h"
|
||||
#include "program/program.h"
|
||||
#include "brw_context.h"
|
||||
#include "brw_eu.h"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -34,8 +34,8 @@
|
|||
#include "brw_vs.h"
|
||||
#include "brw_util.h"
|
||||
#include "brw_state.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "program/prog_print.h"
|
||||
#include "program/prog_parameter.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 {
|
||||
|
|
|
@ -31,9 +31,9 @@
|
|||
|
||||
|
||||
#include "main/macros.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_print.h"
|
||||
#include "brw_context.h"
|
||||
#include "brw_vs.h"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -37,9 +37,9 @@
|
|||
#include "brw_wm.h"
|
||||
#include "brw_util.h"
|
||||
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_print.h"
|
||||
#include "program/prog_statevars.h"
|
||||
|
||||
|
||||
/** An invalid texture target */
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "main/macros.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "shader/prog_optimize.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_print.h"
|
||||
#include "program/prog_optimize.h"
|
||||
#include "brw_context.h"
|
||||
#include "brw_eu.h"
|
||||
#include "brw_wm.h"
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include "brw_context.h"
|
||||
#include "brw_wm.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "program/prog_parameter.h"
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -29,8 +29,8 @@
|
|||
#include "brw_state.h"
|
||||
#include "brw_defines.h"
|
||||
#include "brw_util.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "intel_batchbuffer.h"
|
||||
|
||||
static void
|
||||
|
|
|
@ -29,8 +29,8 @@
|
|||
#include "brw_state.h"
|
||||
#include "brw_defines.h"
|
||||
#include "brw_util.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "intel_batchbuffer.h"
|
||||
|
||||
static void
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 "shader/prog_instruction.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "shader/programopt.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_instruction.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "program/programopt.h"
|
||||
#include "tnl/tnl.h"
|
||||
|
||||
#include "r200_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;
|
||||
|
|
|
@ -38,8 +38,8 @@
|
|||
|
||||
#include "r300_fragprog_common.h"
|
||||
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_print.h"
|
||||
|
||||
#include "compiler/radeon_compiler.h"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 "shader/prog_statevars.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "vbo/vbo.h"
|
||||
#include "tnl/tnl.h"
|
||||
|
||||
|
|
|
@ -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 "shader/programopt.h"
|
||||
#include "shader/prog_instruction.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "program/program.h"
|
||||
#include "program/programopt.h"
|
||||
#include "program/prog_instruction.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_print.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "tnl/tnl.h"
|
||||
|
||||
#include "compiler/radeon_compiler.h"
|
||||
|
|
|
@ -28,8 +28,8 @@
|
|||
#include "radeon_mesa_to_rc.h"
|
||||
|
||||
#include "main/mtypes.h"
|
||||
#include "shader/prog_instruction.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "program/prog_instruction.h"
|
||||
#include "program/prog_parameter.h"
|
||||
|
||||
#include "compiler/radeon_compiler.h"
|
||||
#include "compiler/radeon_program.h"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -32,9 +32,9 @@
|
|||
#include <math.h>
|
||||
|
||||
#include "main/imports.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "shader/program.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "program/program.h"
|
||||
|
||||
#include "r600_context.h"
|
||||
#include "r600_cmdbuf.h"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -41,8 +41,8 @@
|
|||
#include "main/framebuffer.h"
|
||||
#include "drivers/common/meta.h"
|
||||
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "vbo/vbo.h"
|
||||
|
||||
#include "r600_context.h"
|
||||
|
|
|
@ -35,14 +35,14 @@
|
|||
#include "main/mtypes.h"
|
||||
|
||||
#include "tnl/t_context.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_parameter.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"
|
||||
|
|
|
@ -50,8 +50,8 @@
|
|||
#include "main/extensions.h"
|
||||
#include "main/framebuffer.h"
|
||||
#include "main/shaders.h"
|
||||
#include "shader/shader_api.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "program/shader_api.h"
|
||||
#include "program/prog_print.h"
|
||||
#include "drivers/common/driverfuncs.h"
|
||||
#include "tnl/tnl.h"
|
||||
#include "tnl/t_context.h"
|
||||
|
|
|
@ -36,10 +36,10 @@
|
|||
#include "main/macros.h"
|
||||
#include "main/mtypes.h"
|
||||
#include "main/arbprogram.h"
|
||||
#include "shader/arbprogparse.h"
|
||||
#include "shader/nvfragparse.h"
|
||||
#include "shader/nvvertparse.h"
|
||||
#include "shader/program.h"
|
||||
#include "program/arbprogparse.h"
|
||||
#include "program/nvfragparse.h"
|
||||
#include "program/nvvertparse.h"
|
||||
#include "program/program.h"
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -130,8 +130,8 @@
|
|||
#include "version.h"
|
||||
#include "viewport.h"
|
||||
#include "vtxfmt.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_print.h"
|
||||
#if _HAVE_FULL_GL
|
||||
#include "math/m_matrix.h"
|
||||
#endif
|
||||
|
|
|
@ -38,12 +38,12 @@
|
|||
#include "main/macros.h"
|
||||
#include "main/enums.h"
|
||||
#include "main/ffvertex_prog.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/prog_cache.h"
|
||||
#include "shader/prog_instruction.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_cache.h"
|
||||
#include "program/prog_instruction.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_print.h"
|
||||
#include "program/prog_statevars.h"
|
||||
|
||||
|
||||
/** Max of number of lights and texture coord units */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -43,12 +43,12 @@
|
|||
#include "main/imports.h"
|
||||
#include "main/macros.h"
|
||||
#include "main/nvprogram.h"
|
||||
#include "shader/arbprogparse.h"
|
||||
#include "shader/nvfragparse.h"
|
||||
#include "shader/nvvertparse.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/prog_instruction.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "program/arbprogparse.h"
|
||||
#include "program/nvfragparse.h"
|
||||
#include "program/nvvertparse.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_instruction.h"
|
||||
#include "program/prog_parameter.h"
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -42,9 +42,9 @@
|
|||
#include "main/hash.h"
|
||||
#include "main/shaderapi.h"
|
||||
#include "main/shaderobj.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_uniform.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_uniform.h"
|
||||
#include "slang/slang_compile.h"
|
||||
#include "slang/slang_link.h"
|
||||
|
||||
|
|
|
@ -34,9 +34,9 @@
|
|||
#include "main/dispatch.h"
|
||||
#include "main/hash.h"
|
||||
#include "main/shaderobj.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_uniform.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_uniform.h"
|
||||
|
||||
|
||||
/**********************************************************************/
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -41,8 +41,8 @@
|
|||
#include "light.h"
|
||||
#include "matrix.h"
|
||||
#include "pixel.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "state.h"
|
||||
#include "stencil.h"
|
||||
#include "texenvprogram.h"
|
||||
|
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
#include "glheader.h"
|
||||
#include "imports.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_cache.h"
|
||||
#include "shader/prog_instruction.h"
|
||||
#include "shader/prog_print.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "shader/programopt.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_cache.h"
|
||||
#include "program/prog_instruction.h"
|
||||
#include "program/prog_print.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "program/programopt.h"
|
||||
#include "texenvprogram.h"
|
||||
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "teximage.h"
|
||||
#include "texobj.h"
|
||||
#include "mtypes.h"
|
||||
#include "shader/prog_instruction.h"
|
||||
#include "program/prog_instruction.h"
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -39,8 +39,8 @@
|
|||
#include "shaderobj.h"
|
||||
#include "main/dispatch.h"
|
||||
|
||||
#include "shader/prog_parameter.h"
|
||||
//#include "shader/shader_api.h"
|
||||
#include "program/prog_parameter.h"
|
||||
//#include "program/shader_api.h"
|
||||
|
||||
|
||||
#if FEATURE_EXT_transform_feedback
|
||||
|
|
|
@ -41,9 +41,9 @@
|
|||
#include "main/shaderapi.h"
|
||||
#include "main/shaderobj.h"
|
||||
#include "main/uniforms.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "shader/prog_uniform.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "program/prog_uniform.h"
|
||||
|
||||
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -29,8 +29,8 @@
|
|||
#include "main/glheader.h"
|
||||
#include "main/mtypes.h"
|
||||
#include "main/imports.h"
|
||||
#include "shader/prog_cache.h"
|
||||
#include "shader/program.h"
|
||||
#include "program/prog_cache.h"
|
||||
#include "program/program.h"
|
||||
|
||||
|
||||
struct cache_item
|
|
@ -23,12 +23,11 @@
|
|||
*/
|
||||
#include "main/glheader.h"
|
||||
#include "main/imports.h"
|
||||
#include "shader/prog_instruction.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
|
||||
#include "shader/symbol_table.h"
|
||||
#include "shader/program_parser.h"
|
||||
#include "shader/program_parse.tab.h"
|
||||
#include "program/prog_instruction.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "program/symbol_table.h"
|
||||
#include "program/program_parser.h"
|
||||
#include "program/program_parse.tab.h"
|
||||
|
||||
#define require_ARB_vp (yyextra->mode == ARB_vertex)
|
||||
#define require_ARB_fp (yyextra->mode == ARB_fragment)
|
|
@ -98,14 +98,14 @@
|
|||
|
||||
#include "main/mtypes.h"
|
||||
#include "main/imports.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_parameter_layout.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "shader/prog_instruction.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_parameter_layout.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "program/prog_instruction.h"
|
||||
|
||||
#include "shader/symbol_table.h"
|
||||
#include "shader/program_parser.h"
|
||||
#include "program/symbol_table.h"
|
||||
#include "program/program_parser.h"
|
||||
|
||||
extern void *yy_scan_string(char *);
|
||||
extern void yy_delete_buffer(void *);
|
|
@ -27,14 +27,14 @@
|
|||
|
||||
#include "main/mtypes.h"
|
||||
#include "main/imports.h"
|
||||
#include "shader/program.h"
|
||||
#include "shader/prog_parameter.h"
|
||||
#include "shader/prog_parameter_layout.h"
|
||||
#include "shader/prog_statevars.h"
|
||||
#include "shader/prog_instruction.h"
|
||||
#include "program/program.h"
|
||||
#include "program/prog_parameter.h"
|
||||
#include "program/prog_parameter_layout.h"
|
||||
#include "program/prog_statevars.h"
|
||||
#include "program/prog_instruction.h"
|
||||
|
||||
#include "shader/symbol_table.h"
|
||||
#include "shader/program_parser.h"
|
||||
#include "program/symbol_table.h"
|
||||
#include "program/program_parser.h"
|
||||
|
||||
extern void *yy_scan_string(char *);
|
||||
extern void yy_delete_buffer(void *);
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue