diff options
| author | Keith Whitwell <[email protected]> | 2008-10-07 12:31:31 +0100 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-10-07 16:33:52 +0100 |
| commit | 6ff1cf5b82488dc5a07513b0806c23e70f7a665e (patch) | |
| tree | f535160cfc5476a8e3307ba737f67588f7dfb2a7 /src/mesa | |
| parent | c48da7d78b4e7bdbe056b3c9668756d49019be06 (diff) | |
mesa: protect against segfault in get_fp_input_mask()
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index ea2ee160e4f..7049467c22f 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -204,7 +204,10 @@ static GLuint get_fp_input_mask( GLcontext *ctx ) { GLuint fp_inputs = 0; - if (!ctx->VertexProgram._Enabled) { + if (!ctx->VertexProgram._Enabled || + !ctx->VertexProgram._Current) { + + /* Fixed function logic */ GLuint varying_inputs = ctx->varying_vp_inputs; /* First look at what values may be computed by the generated |