summaryrefslogtreecommitdiff
path: root/src/glsl/program.h
AgeCommit message (Collapse)Author
2010-07-26Merge remote branch 'origin/master' into glsl2Eric Anholt
This pulls in multiple i965 driver fixes which will help ensure better testing coverage during development, and also gets past the conflicts of the src/mesa/shader -> src/mesa/program move. Conflicts: src/mesa/Makefile src/mesa/main/shaderapi.c src/mesa/main/shaderobj.h
2010-06-30glsl2: Use Mesa's gl_shader_program instead of our own struct glsl_program.Eric Anholt
This avoids more allocation and shuffling of data around.
2010-06-30glsl2: Move our data from a glsl_shader* on the side to the main gl_shader *.Eric Anholt
This saves recompiling at link time. gl_shader->ir is made a pointer so that we don't have to bring exec_list into mtypes.h.
2010-06-25glsl2: Start integrating ir_to_mesa.cpp into shader_api.hEric Anholt
The compiler is now called by the driver, and generates program instructions. Parameter lists are still not set up, so the driver chokes on it shortly thereafter.
2010-06-25glsl2: Use Mesa types instead of duping them into our program.h.Eric Anholt
2010-06-24glsl2: Move the compiler to the subdirectory it will live in in Mesa.Eric Anholt