aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortaw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>2008-08-06 21:49:27 +0000
committertaw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>2008-08-06 21:49:27 +0000
commit22f17f52f8d8f08f2546a1552e5075d4895d6937 (patch)
tree950f7715223662932cdcb9f575b57c9a56554658 /src
parent51a0182adf818c30df20c95c4f5370b07fa8bcb0 (diff)
Fixes for ATI fussiness
git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@226 84d2e878-0bd5-11dd-ad15-13eda11d74c5
Diffstat (limited to 'src')
-rw-r--r--src/render.c3
-rw-r--r--src/shaderutils.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/render.c b/src/render.c
index e3b5a44..d7ca6db 100644
--- a/src/render.c
+++ b/src/render.c
@@ -32,6 +32,7 @@
static void render_load_shaders(RenderContext *r) {
/* Lighting */
+ printf("Loading lighting shader\n");
r->lighting_vert = shaderutils_load_shader(DATADIR"/shaders/lighting.vert", GL_VERTEX_SHADER);
r->lighting_frag = shaderutils_load_shader(DATADIR"/shaders/lighting.frag", GL_FRAGMENT_SHADER);
r->lighting_program = glCreateProgram();
@@ -41,6 +42,7 @@ static void render_load_shaders(RenderContext *r) {
shaderutils_validate_program(r->lighting_program);
/* Fill-in light */
+ printf("Loading fill lighting shader\n");
r->fill_vert = shaderutils_load_shader(DATADIR"/shaders/fill-light.vert", GL_VERTEX_SHADER);
r->fill_frag = shaderutils_load_shader(DATADIR"/shaders/fill-light.frag", GL_FRAGMENT_SHADER);
r->fill_program = glCreateProgram();
@@ -50,6 +52,7 @@ static void render_load_shaders(RenderContext *r) {
shaderutils_validate_program(r->fill_program);
/* Swirlyness */
+ printf("Loading swirlytron shader\n");
r->swirly_vert = shaderutils_load_shader(DATADIR"/shaders/swirlytron.vert", GL_VERTEX_SHADER);
r->swirly_frag = shaderutils_load_shader(DATADIR"/shaders/swirlytron.frag", GL_FRAGMENT_SHADER);
r->swirly_program = glCreateProgram();
diff --git a/src/shaderutils.c b/src/shaderutils.c
index 74e9bff..6db4212 100644
--- a/src/shaderutils.c
+++ b/src/shaderutils.c
@@ -57,6 +57,7 @@ GLuint shaderutils_load_shader(const char *filename, GLenum type) {
glCompileShader(shader);
glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
if ( status == GL_FALSE ) {
+ printf("Problems loading '%s':\n", filename);
glGetShaderInfoLog(shader, 4095, &l, text);
if ( l > 0 ) {
printf("%s\n", text); fflush(stdout);