[Mesa-dev] [PATCH 08/23] mesa: Remove support for parsing NV fragment programs.

Kenneth Graunke kenneth at whitecape.org
Sun Oct 14 17:43:08 PDT 2012


---
 src/mesa/SConscript            |    1 -
 src/mesa/main/arbprogram.c     |    8 -
 src/mesa/program/nvfragparse.c | 1591 ----------------------------------------
 src/mesa/program/nvfragparse.h |   47 --
 src/mesa/sources.mak           |    1 -
 5 files changed, 1648 deletions(-)
 delete mode 100644 src/mesa/program/nvfragparse.c
 delete mode 100644 src/mesa/program/nvfragparse.h

I removed the delete files from the diff to shrink the email.

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 9760cc3..1dbb61a 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -291,7 +291,6 @@ program_sources = [
     'program/arbprogparse.c',
     'program/hash_table.c',
     'program/ir_to_mesa.cpp',
-    'program/nvfragparse.c',
     'program/program.c',
     'program/program_parse_extra.c',
     'program/prog_cache.c',
diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c
index 4de4cd3..acbffa3 100644
--- a/src/mesa/main/arbprogram.c
+++ b/src/mesa/main/arbprogram.c
@@ -37,7 +37,6 @@
 #include "main/mtypes.h"
 #include "main/arbprogram.h"
 #include "program/arbprogparse.h"
-#include "program/nvfragparse.h"
 #include "program/program.h"
 
 
@@ -364,13 +363,6 @@ _mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
 
       base = & prog->Base;
    }
-   else if (target == GL_FRAGMENT_PROGRAM_NV
-            && ctx->Extensions.NV_fragment_program) {
-      struct gl_fragment_program *prog = ctx->FragmentProgram.Current;
-      _mesa_parse_nv_fragment_program(ctx, target, string, len, prog);
-
-      base = & prog->Base;
-   }
    else {
       _mesa_error(ctx, GL_INVALID_ENUM, "glProgramStringARB(target)");
       return;
diff --git a/src/mesa/program/nvfragparse.c b/src/mesa/program/nvfragparse.c
deleted file mode 100644
index f251d7e..0000000
--- a/src/mesa/program/nvfragparse.c
+++ /dev/null
diff --git a/src/mesa/program/nvfragparse.h b/src/mesa/program/nvfragparse.h
deleted file mode 100644
index 088e752..0000000
--- a/src/mesa/program/nvfragparse.h
+++ /dev/null
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 04ddfe8..b14ec13 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -249,7 +249,6 @@ STATETRACKER_FILES = \
 PROGRAM_FILES = \
 	$(SRCDIR)program/arbprogparse.c \
 	$(SRCDIR)program/hash_table.c \
-	$(SRCDIR)program/nvfragparse.c \
 	$(SRCDIR)program/program.c \
 	$(SRCDIR)program/program_parse_extra.c \
 	$(SRCDIR)program/prog_cache.c \
-- 
1.7.12.2



More information about the mesa-dev mailing list