Skip to content
Permalink
Browse files
Wrote most of the arb1 OpenGL glue code.
--HG--
branch : trunk
  • Loading branch information
icculus committed May 28, 2008
1 parent e331e51 commit 36962c47267b5900dfc83c65ba9d8a4b759019c3
Showing with 309 additions and 106 deletions.
  1. +2 −3 CMakeLists.txt
  2. +1 −0 mojoshader.c
  3. +306 −103 mojoshader_opengl.c
@@ -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 ...
@@ -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

0 comments on commit 36962c4

Please sign in to comment.