summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2011-01-22 15:49:58 -0800
committerKenneth Graunke <kenneth@whitecape.org>2011-01-22 15:51:21 -0800
commiteebb3ac1dcceebfdad3db33ebc672346980f4177 (patch)
tree2dd787db669e43149b6f4171c0b05fbb7b3a1a99
parente0fc293f4f7b382a2de6655128d42d435c293075 (diff)
main: Remove leftover shader loading cruft.
-rwxr-xr-xsrc/main.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/main.cpp b/src/main.cpp
index c64ab6c..1c2604b 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -35,16 +35,12 @@ static bool done = false;
static int win_width, win_height;
-static GLuint prog;
-
static GLuint main_fbo;
static GLuint main_fbo_tex;
static GLuint shadow_fbo;
static GLuint shadow_fbo_tex;
-static GLuint sampler_slot;
-
static void
Redisplay()
{
@@ -82,15 +78,6 @@ Idle(void)
}
-/* Load, compile, link, etc. the vertex and fragment programs.
- */
-static void
-setup_shader()
-{
- sampler_slot = glGetUniformLocation(prog, "sampler");
-}
-
-
static void
Init()
{
@@ -104,8 +91,6 @@ Init()
exit(1);
}
- setup_shader();
-
printf("GL_RENDERER = %s\n", (const char *) glGetString(GL_RENDERER));
printf("Keyboard input:\n"
" ESC: Exit program.\n"
@@ -176,11 +161,6 @@ Key(SDLKey sym, bool state)
SDL_WM_ToggleFullScreen(my_surf);
break;
- case 'c':
- printf("Reloading postprocessing shaders...\n");
- setup_shader();
- break;
-
default:
Scene::Key(sym, state);
break;