OSDN Git Service

mesa: Track fixed-function fragment shader as a shader
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 15 Nov 2011 20:01:18 +0000 (12:01 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Wed, 11 Jan 2012 20:51:24 +0000 (12:51 -0800)
commitb527dd65c830a2b008816cf390d5be906e29bb23
tree7582147e6d7b182608985c0718d0e6a386f55c34
parentca5b30bf8142d916a40eaaa7091882464a237f1f
mesa: Track fixed-function fragment shader as a shader

Previously the fixed-function fragment shader was tracked as a
gl_program.  This means that it shows up in the driver as a Mesa IR
program instead of as a GLSL IR program.  If a driver doesn't generate
Mesa IR from the GLSL IR, that program is empty.  If the program is
empty there is either no rendering or a GPU hang.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
src/mesa/drivers/dri/i965/brw_wm.c
src/mesa/drivers/dri/i965/brw_wm_state.c
src/mesa/drivers/dri/i965/gen6_wm_state.c
src/mesa/drivers/dri/i965/gen7_wm_state.c
src/mesa/main/mtypes.h
src/mesa/main/shaderapi.c
src/mesa/main/state.c