summaryrefslogtreecommitdiff
path: root/progs/glsl
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-08-20 10:58:05 -0600
committerBrian Paul <brianp@vmware.com>2009-08-20 14:43:32 -0600
commit174054c973eca95b9640c44f08da3da6e74de68e (patch)
tree323ffd20251c2c82c382c7d1bf9ca9262fdc8bdf /progs/glsl
parentd7c55555ac6b6bf60cf7fd54dfea0e62ce57542c (diff)
progs/glsl: tweaks to shtest.c
1. Larger sphere to match cube size 2. Allow -geometry option to override window size 3. Cube samplers
Diffstat (limited to 'progs/glsl')
-rw-r--r--progs/glsl/shtest.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/progs/glsl/shtest.c b/progs/glsl/shtest.c
index 54b12cc50b..6b560bb2cd 100644
--- a/progs/glsl/shtest.c
+++ b/progs/glsl/shtest.c
@@ -257,7 +257,7 @@ Redisplay(void)
glMatrixMode(GL_MODELVIEW);
if (Object == SPHERE) {
- Sphere(2.0, 20, 10);
+ Sphere(2.5, 20, 10);
}
else if (Object == CUBE) {
Cube(2.0);
@@ -426,6 +426,7 @@ TypeFromName(const char *n)
{ "GL_INT_VEC3", GL_INT_VEC3 },
{ "GL_INT_VEC4", GL_INT_VEC4 },
{ "GL_SAMPLER_2D", GL_SAMPLER_2D },
+ { "GL_SAMPLER_CUBE", GL_SAMPLER_CUBE },
{ NULL, 0 }
};
GLuint i;
@@ -613,8 +614,8 @@ ParseOptions(int argc, char *argv[])
int
main(int argc, char *argv[])
{
- glutInit(&argc, argv);
glutInitWindowSize(400, 400);
+ glutInit(&argc, argv);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
win = glutCreateWindow(argv[0]);
glewInit();