OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

progs/glsl: tweaks to shtest.c

Browse Source 
1. Larger sphere to match cube size
2. Allow -geometry option to override window size
3. Cube samplers
This commit is contained in:
Brian Paul
2009-08-20 10:58:05 -06:00
parent d7c55555ac
commit 174054c973
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
progs/glsl/shtest.c
View File

@@ -257,7 +257,7 @@ Redisplay(void)
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
if (Object == SPHERE) { if (Object == SPHERE) {
Sphere(2.0, 20, 10); Sphere(2.5, 20, 10);
} }
else if (Object == CUBE) { else if (Object == CUBE) {
Cube(2.0); Cube(2.0);
@@ -426,6 +426,7 @@ TypeFromName(const char *n)
{ "GL_INT_VEC3", GL_INT_VEC3 }, { "GL_INT_VEC3", GL_INT_VEC3 },
{ "GL_INT_VEC4", GL_INT_VEC4 }, { "GL_INT_VEC4", GL_INT_VEC4 },
{ "GL_SAMPLER_2D", GL_SAMPLER_2D }, { "GL_SAMPLER_2D", GL_SAMPLER_2D },
{ "GL_SAMPLER_CUBE", GL_SAMPLER_CUBE },
{ NULL, 0 } { NULL, 0 }
}; };
GLuint i; GLuint i;
@@ -613,8 +614,8 @@ ParseOptions(int argc, char *argv[])
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
glutInit(&argc, argv);
glutInitWindowSize(400, 400); glutInitWindowSize(400, 400);
glutInit(&argc, argv);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
win = glutCreateWindow(argv[0]); win = glutCreateWindow(argv[0]);
glewInit(); glewInit();