commit d930ee22fe4e5586e779f5fd19cd520c76911f02
parent 6dc8bf8f16aecb4920a41738bb95f84f6d1802c2
Author: Brian Swetland <swetland@frotz.net>
Date: Sat, 9 Feb 2013 21:43:05 -0800
g++ 4.7.2 does not like "filename"SL - add a space before SL
Diffstat:
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/textgrid.cc b/common/textgrid.cc
@@ -71,17 +71,17 @@ int TextGrid::init(App *a, int w, int h) {
if (a->initBuffer(&ubuf, NULL, sizeof(cb)))
return -1;
#if BUILTIN
- if (a->compileShader(&ps, "TextPS."SL,
+ if (a->compileShader(&ps, "TextPS." SL,
(void*) codeTextPS, sizeof(codeTextPS), 1))
return -1;
- if (a->compileShader(&vs, "TextVS."SL,
+ if (a->compileShader(&vs, "TextVS." SL,
(void*) codeTextVS, sizeof(codeTextVS), 1,
text_layout_desc, sizeof(text_layout_desc)/sizeof(text_layout_desc[0])))
return -1;
#else
- if (a->loadShader(&ps, "TextPS."SL))
+ if (a->loadShader(&ps, "TextPS." SL))
return -1;
- if (a->loadShader(&vs, "TextVS."SL,
+ if (a->loadShader(&vs, "TextVS." SL,
text_layout_desc, sizeof(text_layout_desc)/sizeof(text_layout_desc[0])))
return -1;
#endif
diff --git a/hello/hello.cc b/hello/hello.cc
@@ -114,9 +114,9 @@ void TestApp::build(void) {
}
int TestApp::init(void) {
- if (loadShader(&ps, "SimplePS."SL ))
+ if (loadShader(&ps, "SimplePS." SL ))
return -1;
- if (loadShader(&vs, "SimpleVS."SL, obj_layout, sizeof(obj_layout) / sizeof(obj_layout[0])))
+ if (loadShader(&vs, "SimpleVS." SL, obj_layout, sizeof(obj_layout) / sizeof(obj_layout[0])))
return -1;
if (!(m = load_wavefront_obj("unitcubeoid.obj")))