diff options
| author | Brian <[email protected]> | 2007-10-02 16:55:21 -0600 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-10-02 16:55:21 -0600 |
| commit | d781cdc8fadc802a1f2edbeb13ccb1ee768ce803 (patch) | |
| tree | c8551d50d4f21e6577ce4d2e39a589c4f2b4d723 /src/mesa/main | |
| parent | c9dceb17c0bf255252f58a4c947522b958fe015c (diff) | |
Generate a texenv fragment program if there's a GLSL vertex shader but no GLSL fragment shader.
This allows Glean glsl1 test to get pretty far.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index cdf35b46369..a554c033c40 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -1247,7 +1247,8 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx ) /* If a conventional fragment program/shader isn't in effect... */ if (!ctx->FragmentProgram._Enabled && - !ctx->Shader.CurrentProgram) { + (!ctx->Shader.CurrentProgram || + !ctx->Shader.CurrentProgram->FragmentProgram) ) { make_state_key(ctx, &key); hash = hash_key(&key); |