Wrote most of the arb1 OpenGL glue code.

--HG-- branch : trunk
icculus · May 28, 2008 · 36962c4 · 36962c4
1 parent e331e51
commit 36962c4
Show file tree

Hide file tree

Showing 3 changed files with 309 additions and 106 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ IF(MSVC)
     ADD_DEFINITIONS(-TP)  # force .c files to compile as C++.
 ENDIF(MSVC)
 
-#FIND_PACKAGE(SDL)
+FIND_PACKAGE(SDL)
 IF(SDL_FOUND)
     INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
     ADD_DEFINITIONS(-DFINDERRORS_COMPILE_SHADERS=1)
@@ -22,8 +22,7 @@ IF(SDL_FOUND)
 ENDIF(SDL_FOUND)
 
 ADD_EXECUTABLE(testparse testparse.c mojoshader.c)
-#ADD_EXECUTABLE(finderrors finderrors.c mojoshader.c mojoshader_opengl.c)
-ADD_EXECUTABLE(finderrors finderrors.c mojoshader.c)
+ADD_EXECUTABLE(finderrors finderrors.c mojoshader.c mojoshader_opengl.c)
 TARGET_LINK_LIBRARIES(finderrors ${SDL_LIBRARY} ${EXTRA_LIBS})
 
 # End of CMakeLists.txt ...

diff --git a/mojoshader.c b/mojoshader.c
@@ -3724,6 +3724,7 @@ static void emit_ARB1_uniform(Context *ctx, RegisterType regtype, int regnum)
     } // if
     else
     {
+        // !!! FIXME: this only works if you have no bool or int uniforms.
         output_line(ctx, "PARAM %s = program.env[%d];", varname, regnum);
     } // else