fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 03:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

progs/glsl: silence warnings, remove debug code, adjust window size, etc

Browse source
This commit is contained in:
Brian Paul 2010-03-24 09:03:33 -06:00
parent 4e328774d4
commit 79394f0267
2 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
progs/glsl/fsraytrace.c
View file

@ -237,12 +237,13 @@ Draw(void)
{
float rot[9] = {1,0,0, 0,1,0, 0,0,1};
GLint location = glGetUniformLocation(program, "rot");
glUseProgram(program);
glUniformMatrix3fv(location, 1, 0, rot);
static const float m = -10.F;
static const float p = 10.F;
static const float d = -0.5F;
glUseProgram(program);
glUniformMatrix3fv(location, 1, 0, rot);
glBegin(GL_QUADS);
{
glTexCoord2f(0.0F, 0.0F); glVertex3f(m, m, d);
@ -255,18 +256,21 @@ Draw(void)
glutSwapBuffers();
static int frames = 0;
static int t0 = 0;
static int t1 = 0;
frames++;
t1 = glutGet(GLUT_ELAPSED_TIME);
float dt = (float)(t1-t0)/1000.0F;
if(dt >= 5.0F)
{
float fps = (float)frames / dt;
printf("%f FPS (%d frames in %f seconds)\n", fps, frames, dt);
frames = 0;
t0 = t1;
static int frames = 0;
static int t0 = 0;
static int t1 = 0;
float dt;
frames++;
t1 = glutGet(GLUT_ELAPSED_TIME);
dt = (float)(t1-t0)/1000.0F;
if(dt >= 5.0F)
{
float fps = (float)frames / dt;
printf("%f FPS (%d frames in %f seconds)\n", fps, frames, dt);
frames = 0;
t0 = t1;
}
}
}
@ -366,9 +370,8 @@ Init(void)
int
main(int argc, char *argv[])
{
/*setenv("LIBGL_ALWAYS_SOFTWARE", "1", 1);*/
glutInit(&argc, argv);
glutInitWindowSize(WinWidth, WinHeight);
glutInit(&argc, argv);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
Win = glutCreateWindow(argv[0]);
glewInit();

31
progs/glsl/vsraytrace.c
View file

@ -30,8 +30,7 @@
static int Win;
//static int WinWidth = 256, WinHeight = 256;
static int WinWidth = 50, WinHeight = 50;
static int WinWidth = 256, WinHeight = 256;
static int mouseGrabbed = 0;
static const char* vsSource =
@ -241,18 +240,21 @@ Draw(void)
glutSwapBuffers();
static int frames = 0;
static int t0 = 0;
static int t1 = 0;
frames++;
t1 = glutGet(GLUT_ELAPSED_TIME);
float dt = (float)(t1-t0)/1000.0F;
if(dt >= 5.0F)
{
float fps = (float)frames / dt;
printf("%f FPS (%d frames in %f seconds)\n", fps, frames, dt);
frames = 0;
t0 = t1;
static int frames = 0;
static int t0 = 0;
static int t1 = 0;
float dt;
frames++;
t1 = glutGet(GLUT_ELAPSED_TIME);
dt = (float)(t1-t0)/1000.0F;
if (dt >= 5.0F)
{
float fps = (float)frames / dt;
printf("%f FPS (%d frames in %f seconds)\n", fps, frames, dt);
frames = 0;
t0 = t1;
}
}
}
@ -344,9 +346,8 @@ Init(void)
int
main(int argc, char *argv[])
{
// setenv("LIBGL_ALWAYS_SOFTWARE", "1", 1);
glutInit(&argc, argv);
glutInitWindowSize(WinWidth, WinHeight);
glutInit(&argc, argv);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
Win = glutCreateWindow(argv[0]);
glewInit();