
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
160 lines
3.3 KiB
C
160 lines
3.3 KiB
C
|
|
/*
|
|
* Trivial CVA test, good for testing driver fastpaths (especially
|
|
* indexed vertex buffers if they are supported).
|
|
*
|
|
* Gareth Hughes
|
|
* November 2000
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stddef.h> /* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
|
|
#ifdef _WIN32
|
|
#include <windows.h>
|
|
#endif
|
|
#define GL_GLEXT_LEGACY
|
|
#include <GL/glut.h>
|
|
#include <GL/glext.h>
|
|
|
|
GLfloat verts[][4] = {
|
|
{ -0.5, -0.5, -2.0, 0.0 },
|
|
{ 0.5, -0.5, -2.0, 0.0 },
|
|
{ -0.5, 0.5, -2.0, 0.0 },
|
|
{ 0.5, 0.5, -2.0, 0.0 },
|
|
};
|
|
|
|
GLubyte color[][4] = {
|
|
{ 0xff, 0x00, 0x00, 0x00 },
|
|
{ 0x00, 0xff, 0x00, 0x00 },
|
|
{ 0x00, 0x00, 0xff, 0x00 },
|
|
{ 0xff, 0xff, 0xff, 0x00 },
|
|
};
|
|
|
|
GLuint indices[] = { 0, 1, 2, 3 };
|
|
|
|
GLboolean compiled = GL_TRUE;
|
|
GLboolean doubleBuffer = GL_TRUE;
|
|
|
|
|
|
void init( void )
|
|
{
|
|
glClearColor( 0.0, 0.0, 0.0, 0.0 );
|
|
glShadeModel( GL_SMOOTH );
|
|
|
|
glFrontFace( GL_CCW );
|
|
glCullFace( GL_BACK );
|
|
glEnable( GL_CULL_FACE );
|
|
|
|
glEnable( GL_DEPTH_TEST );
|
|
|
|
glEnableClientState( GL_VERTEX_ARRAY );
|
|
glEnableClientState( GL_COLOR_ARRAY );
|
|
|
|
glMatrixMode( GL_PROJECTION );
|
|
glLoadIdentity();
|
|
glFrustum( -1.0, 1.0, -1.0, 1.0, 2.0, 10.0 );
|
|
glMatrixMode( GL_MODELVIEW );
|
|
glLoadIdentity();
|
|
|
|
glVertexPointer( 3, GL_FLOAT, sizeof(verts[0]), verts );
|
|
glColorPointer( 4, GL_UNSIGNED_BYTE, 0, color );
|
|
|
|
#ifdef GL_EXT_compiled_vertex_array
|
|
if ( compiled ) {
|
|
glLockArraysEXT( 0, 4 );
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void display( void )
|
|
{
|
|
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
|
|
|
|
glDrawElements( GL_TRIANGLES, 3, GL_UNSIGNED_INT, indices );
|
|
|
|
glFlush();
|
|
if ( doubleBuffer ) {
|
|
glutSwapBuffers();
|
|
}
|
|
}
|
|
|
|
void keyboard( unsigned char key, int x, int y )
|
|
{
|
|
switch ( key ) {
|
|
case 27:
|
|
exit( 0 );
|
|
break;
|
|
}
|
|
|
|
glutPostRedisplay();
|
|
}
|
|
|
|
GLboolean args( int argc, char **argv )
|
|
{
|
|
GLint i;
|
|
|
|
doubleBuffer = GL_TRUE;
|
|
|
|
for ( i = 1 ; i < argc ; i++ ) {
|
|
if ( strcmp( argv[i], "-sb" ) == 0 ) {
|
|
doubleBuffer = GL_FALSE;
|
|
} else if ( strcmp( argv[i], "-db" ) == 0 ) {
|
|
doubleBuffer = GL_TRUE;
|
|
} else {
|
|
fprintf( stderr, "%s (Bad option).\n", argv[i] );
|
|
return GL_FALSE;
|
|
}
|
|
}
|
|
return GL_TRUE;
|
|
}
|
|
|
|
int main( int argc, char **argv )
|
|
{
|
|
GLenum type;
|
|
char *string;
|
|
double version;
|
|
|
|
glutInit( &argc, argv );
|
|
|
|
if ( args( argc, argv ) == GL_FALSE ) {
|
|
exit( 1 );
|
|
}
|
|
|
|
type = GLUT_RGB | GLUT_DEPTH;
|
|
type |= ( doubleBuffer ) ? GLUT_DOUBLE : GLUT_SINGLE;
|
|
|
|
glutInitDisplayMode( type );
|
|
glutInitWindowSize( 250, 250 );
|
|
glutInitWindowPosition( 100, 100 );
|
|
glutCreateWindow( "CVA Test" );
|
|
|
|
/* Make sure the server supports GL 1.2 vertex arrays.
|
|
*/
|
|
string = (char *) glGetString( GL_VERSION );
|
|
|
|
version = atof(string);
|
|
if ( version < 1.2 ) {
|
|
fprintf( stderr, "This program requires OpenGL 1.2 vertex arrays.\n" );
|
|
exit( -1 );
|
|
}
|
|
|
|
/* See if the server supports compiled vertex arrays.
|
|
*/
|
|
string = (char *) glGetString( GL_EXTENSIONS );
|
|
|
|
if ( !strstr( string, "GL_EXT_compiled_vertex_array" ) ) {
|
|
fprintf( stderr, "Compiled vertex arrays not supported by this renderer.\n" );
|
|
compiled = GL_FALSE;
|
|
}
|
|
|
|
init();
|
|
|
|
glutDisplayFunc( display );
|
|
glutKeyboardFunc( keyboard );
|
|
glutMainLoop();
|
|
|
|
return 0;
|
|
}
|