Mesa (mesa_7_6_branch): prog parse: Handle GL_FRAGMENT_PROGRAM_ARB in glLoadProgramNV
Ian Romanick
idr at kemper.freedesktop.org
Sat Nov 7 23:55:55 UTC 2009
Module: Mesa
Branch: mesa_7_6_branch
Commit: 289db82b2d42b0d79fd0c01781612bd4e69a9474
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=289db82b2d42b0d79fd0c01781612bd4e69a9474
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Nov 2 13:38:15 2009 -0800
prog parse: Handle GL_FRAGMENT_PROGRAM_ARB in glLoadProgramNV
---
src/mesa/shader/nvprogram.c | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/mesa/shader/nvprogram.c b/src/mesa/shader/nvprogram.c
index 471a735..80ed410 100644
--- a/src/mesa/shader/nvprogram.c
+++ b/src/mesa/shader/nvprogram.c
@@ -47,6 +47,7 @@
#include "prog_instruction.h"
#include "nvfragparse.h"
#include "nvvertparse.h"
+#include "arbprogparse.h"
#include "nvprogram.h"
@@ -643,6 +644,20 @@ _mesa_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
}
_mesa_parse_nv_fragment_program(ctx, target, program, len, fprog);
}
+ else if (target == GL_FRAGMENT_PROGRAM_ARB
+ && ctx->Extensions.ARB_fragment_program) {
+ struct gl_fragment_program *fprog = (struct gl_fragment_program *) prog;
+ if (!fprog || prog == &_mesa_DummyProgram) {
+ fprog = (struct gl_fragment_program *)
+ ctx->Driver.NewProgram(ctx, target, id);
+ if (!fprog) {
+ _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
+ return;
+ }
+ _mesa_HashInsert(ctx->Shared->Programs, id, fprog);
+ }
+ _mesa_parse_arb_fragment_program(ctx, target, program, len, fprog);
+ }
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glLoadProgramNV(target)");
}
More information about the mesa-commit
mailing list