summaryrefslogtreecommitdiffstats
path: root/src/glsl/program.h
Commit message (Collapse)AuthorAgeFilesLines
* Drop GLcontext typedef and use struct gl_context insteadKristian Høgsberg2010-10-131-1/+1
|
* glsl: Include main/core.h.Chia-I Wu2010-08-241-7/+1
| | | | Make glsl include only main/core.h from core mesa.
* mesa: Free old linked shaders when relinking new shaders.Eric Anholt2010-08-181-1/+1
|
* Merge remote branch 'origin/master' into glsl2Eric Anholt2010-07-261-2/+2
| | | | | | | | | | | 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
* glsl2: Use Mesa's gl_shader_program instead of our own struct glsl_program.Eric Anholt2010-06-301-33/+1
| | | | This avoids more allocation and shuffling of data around.
* glsl2: Move our data from a glsl_shader* on the side to the main gl_shader *.Eric Anholt2010-06-301-20/+2
| | | | | 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.
* glsl2: Start integrating ir_to_mesa.cpp into shader_api.hEric Anholt2010-06-251-0/+4
| | | | | | 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.
* glsl2: Use Mesa types instead of duping them into our program.h.Eric Anholt2010-06-251-78/+2
|
* glsl2: Move the compiler to the subdirectory it will live in in Mesa.Eric Anholt2010-06-241-0/+155