
A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
237 lines
4.7 KiB
C
237 lines
4.7 KiB
C
|
|
/*
|
|
* Test multisampling and polygon smoothing.
|
|
*
|
|
* Brian Paul
|
|
* 4 November 2002
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <math.h>
|
|
#include <GL/glut.h>
|
|
|
|
|
|
static GLfloat Zrot = 0;
|
|
static GLboolean Anim = GL_TRUE;
|
|
static GLboolean HaveMultisample = GL_TRUE;
|
|
static GLboolean DoMultisample = GL_TRUE;
|
|
|
|
|
|
static void
|
|
PrintString(const char *s)
|
|
{
|
|
while (*s) {
|
|
glutBitmapCharacter(GLUT_BITMAP_8_BY_13, (int) *s);
|
|
s++;
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
Polygon( GLint verts, GLfloat radius, GLfloat z )
|
|
{
|
|
int i;
|
|
for (i = 0; i < verts; i++) {
|
|
float a = (i * 2.0 * 3.14159) / verts;
|
|
float x = radius * cos(a);
|
|
float y = radius * sin(a);
|
|
glVertex3f(x, y, z);
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
DrawObject( void )
|
|
{
|
|
glLineWidth(3.0);
|
|
glColor3f(1, 1, 1);
|
|
glBegin(GL_LINE_LOOP);
|
|
Polygon(12, 1.2, 0);
|
|
glEnd();
|
|
|
|
glLineWidth(1.0);
|
|
glColor3f(1, 1, 1);
|
|
glBegin(GL_LINE_LOOP);
|
|
Polygon(12, 1.1, 0);
|
|
glEnd();
|
|
|
|
glColor3f(1, 0, 0);
|
|
glBegin(GL_POLYGON);
|
|
Polygon(12, 0.4, 0.3);
|
|
glEnd();
|
|
|
|
glColor3f(0, 1, 0);
|
|
glBegin(GL_POLYGON);
|
|
Polygon(12, 0.6, 0.2);
|
|
glEnd();
|
|
|
|
glColor3f(0, 0, 1);
|
|
glBegin(GL_POLYGON);
|
|
Polygon(12, 0.8, 0.1);
|
|
glEnd();
|
|
|
|
glColor3f(1, 1, 1);
|
|
glBegin(GL_POLYGON);
|
|
Polygon(12, 1.0, 0);
|
|
glEnd();
|
|
}
|
|
|
|
|
|
static void
|
|
Display( void )
|
|
{
|
|
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
|
|
|
|
glColor3f(1, 1, 1);
|
|
if (HaveMultisample) {
|
|
glRasterPos2f(-3.1, -1.6);
|
|
if (DoMultisample)
|
|
PrintString("MULTISAMPLE");
|
|
else
|
|
PrintString("MULTISAMPLE (off)");
|
|
}
|
|
glRasterPos2f(-0.8, -1.6);
|
|
PrintString("No antialiasing");
|
|
glRasterPos2f(1.6, -1.6);
|
|
PrintString("GL_POLYGON_SMOOTH");
|
|
|
|
/* multisample */
|
|
if (HaveMultisample) {
|
|
glEnable(GL_DEPTH_TEST);
|
|
if (DoMultisample)
|
|
glEnable(GL_MULTISAMPLE_ARB);
|
|
glPushMatrix();
|
|
glTranslatef(-2.5, 0, 0);
|
|
glPushMatrix();
|
|
glRotatef(Zrot, 0, 0, 1);
|
|
DrawObject();
|
|
glPopMatrix();
|
|
glPopMatrix();
|
|
glDisable(GL_MULTISAMPLE_ARB);
|
|
glDisable(GL_DEPTH_TEST);
|
|
}
|
|
|
|
/* non-aa */
|
|
glEnable(GL_DEPTH_TEST);
|
|
glPushMatrix();
|
|
glTranslatef(0, 0, 0);
|
|
glPushMatrix();
|
|
glRotatef(Zrot, 0, 0, 1);
|
|
DrawObject();
|
|
glPopMatrix();
|
|
glPopMatrix();
|
|
glDisable(GL_DEPTH_TEST);
|
|
|
|
/* polygon smooth */
|
|
glEnable(GL_POLYGON_SMOOTH);
|
|
glEnable(GL_LINE_SMOOTH);
|
|
glEnable(GL_BLEND);
|
|
glPushMatrix();
|
|
glTranslatef(2.5, 0, 0);
|
|
glPushMatrix();
|
|
glRotatef(Zrot, 0, 0, 1);
|
|
DrawObject();
|
|
glPopMatrix();
|
|
glPopMatrix();
|
|
glDisable(GL_LINE_SMOOTH);
|
|
glDisable(GL_POLYGON_SMOOTH);
|
|
glDisable(GL_BLEND);
|
|
|
|
glutSwapBuffers();
|
|
}
|
|
|
|
|
|
static void
|
|
Reshape( int width, int height )
|
|
{
|
|
GLfloat ar = (float) width / (float) height;
|
|
glViewport( 0, 0, width, height );
|
|
glMatrixMode( GL_PROJECTION );
|
|
glLoadIdentity();
|
|
glOrtho(-2.0*ar, 2.0*ar, -2.0, 2.0, -1.0, 1.0);
|
|
glMatrixMode( GL_MODELVIEW );
|
|
glLoadIdentity();
|
|
}
|
|
|
|
|
|
static void
|
|
Idle( void )
|
|
{
|
|
Zrot = 0.01 * glutGet(GLUT_ELAPSED_TIME);
|
|
glutPostRedisplay();
|
|
}
|
|
|
|
|
|
static void
|
|
Key( unsigned char key, int x, int y )
|
|
{
|
|
const GLfloat step = 1.0;
|
|
(void) x;
|
|
(void) y;
|
|
switch (key) {
|
|
case 'a':
|
|
Anim = !Anim;
|
|
if (Anim)
|
|
glutIdleFunc(Idle);
|
|
else
|
|
glutIdleFunc(NULL);
|
|
break;
|
|
case 'm':
|
|
DoMultisample = !DoMultisample;
|
|
break;
|
|
case 'z':
|
|
Zrot = (int) (Zrot - step);
|
|
break;
|
|
case 'Z':
|
|
Zrot = (int) (Zrot + step);
|
|
break;
|
|
case 27:
|
|
exit(0);
|
|
break;
|
|
}
|
|
glutPostRedisplay();
|
|
}
|
|
|
|
|
|
static void
|
|
Init( void )
|
|
{
|
|
/* GLUT imposes the four samples/pixel requirement */
|
|
int s;
|
|
glGetIntegerv(GL_SAMPLES_ARB, &s);
|
|
if (!glutExtensionSupported("GL_ARB_multisample") || s < 1) {
|
|
printf("Warning: multisample antialiasing not supported.\n");
|
|
HaveMultisample = GL_FALSE;
|
|
}
|
|
printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
|
|
printf("GL_SAMPLES_ARB = %d\n", s);
|
|
|
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
|
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
glBlendFunc(GL_SRC_ALPHA_SATURATE, GL_ONE);
|
|
|
|
glGetIntegerv(GL_MULTISAMPLE_ARB, &s);
|
|
printf("GL_MULTISAMPLE_ARB = %d\n", s);
|
|
}
|
|
|
|
|
|
int
|
|
main( int argc, char *argv[] )
|
|
{
|
|
glutInit( &argc, argv );
|
|
glutInitWindowPosition( 0, 0 );
|
|
glutInitWindowSize( 600, 300 );
|
|
glutInitDisplayMode( GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE |
|
|
GLUT_DEPTH | GLUT_MULTISAMPLE );
|
|
glutCreateWindow(argv[0]);
|
|
glutReshapeFunc( Reshape );
|
|
glutKeyboardFunc( Key );
|
|
glutDisplayFunc( Display );
|
|
if (Anim)
|
|
glutIdleFunc( Idle );
|
|
Init();
|
|
glutMainLoop();
|
|
return 0;
|
|
}
|