diff options
| author | Michal Krol <mjkrol@gmail.org> | 2004-10-21 14:06:18 +0000 |
|---|---|---|
| committer | Michal Krol <mjkrol@gmail.org> | 2004-10-21 14:06:18 +0000 |
| commit | ed60e19d8a5ad0d22e3164ebfe8b056a352106d4 (patch) | |
| tree | d0cba69cdbc9e6a33420a5e87f8025a46eb72aa3 /src/mesa | |
| parent | 718ba9773bf570b9f5e2cf2a98a6ccf4980da537 (diff) | |
remove redundant check of parsed program target
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/shader/arbfragparse.c | 16 | ||||
| -rw-r--r-- | src/mesa/shader/arbvertparse.c | 16 |
2 files changed, 2 insertions, 30 deletions
diff --git a/src/mesa/shader/arbfragparse.c b/src/mesa/shader/arbfragparse.c index a0fc9dd5bb..9c85d3413a 100644 --- a/src/mesa/shader/arbfragparse.c +++ b/src/mesa/shader/arbfragparse.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.1 + * Version: 6.2 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * @@ -222,20 +222,6 @@ _mesa_parse_arb_fragment_program(GLcontext * ctx, GLenum target, program->Parameters = ap.Parameters; program->FogOption = ap.FogOption; - /* XXX: Eh.. we parsed something that wasn't a fragment program. doh! */ - /* this wont happen any more */ -/* - if (ap.Base.Target != GL_FRAGMENT_PROGRAM_ARB) - { - program->Instructions = (struct fp_instruction *) _mesa_malloc ( - sizeof(struct fp_instruction) ); - program->Instructions[0].Opcode = FP_OPCODE_END; - - _mesa_error (ctx, GL_INVALID_OPERATION, "Parsed a non-fragment program as a fragment program"); - return; - } -*/ - #if DEBUG_FP _mesa_debug_fp_inst(ap.Base.NumInstructions, ap.FPInstructions); #endif diff --git a/src/mesa/shader/arbvertparse.c b/src/mesa/shader/arbvertparse.c index d0e776b47c..fb6a642b64 100644 --- a/src/mesa/shader/arbvertparse.c +++ b/src/mesa/shader/arbvertparse.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.1 + * Version: 6.2 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * @@ -206,20 +206,6 @@ _mesa_parse_arb_vertex_program(GLcontext * ctx, GLenum target, program->OutputsWritten = ap.OutputsWritten; program->Parameters = ap.Parameters; - /* Eh.. we parsed something that wasn't a vertex program. doh! */ - /* this wont happen any more */ -/* - if (ap.Base.Target != GL_VERTEX_PROGRAM_ARB) - { - program->Instructions = (struct vp_instruction *) _mesa_malloc ( - sizeof(struct vp_instruction) ); - program->Instructions[0].Opcode = VP_OPCODE_END; - - _mesa_error (ctx, GL_INVALID_OPERATION, "Parsed a non-vertex program as a vertex program"); - return; - } -*/ - program->Instructions = ap.VPInstructions; #if DEBUG_VP |