summaryrefslogtreecommitdiffstats
path: root/progs/tests
diff options
context:
space:
mode:
Diffstat (limited to 'progs/tests')
-rw-r--r--progs/tests/.gitignore3
-rw-r--r--progs/tests/arraytexture.c1
-rw-r--r--progs/tests/bufferobj.c8
-rw-r--r--progs/tests/bug_3195.c1
-rw-r--r--progs/tests/cva.c1
-rw-r--r--progs/tests/mipgen.c2
-rw-r--r--progs/tests/mipmap_comp.c2
-rw-r--r--progs/tests/mipmap_comp_tests.c2
-rw-r--r--progs/tests/mipmap_view.c1
-rw-r--r--progs/tests/no_s3tc.c1
-rw-r--r--progs/tests/streaming_rect.c2
-rw-r--r--progs/tests/zcomp.c1
12 files changed, 10 insertions, 15 deletions
diff --git a/progs/tests/.gitignore b/progs/tests/.gitignore
index 3479ff8b33b..8b3e9f35583 100644
--- a/progs/tests/.gitignore
+++ b/progs/tests/.gitignore
@@ -13,6 +13,7 @@ arbvptest3
arbvptorus
arbvpwarpmesh
arraytexture
+auxbuffer
blendminmax
blendsquare
blendxor
@@ -23,10 +24,12 @@ bug_3195
bug_texstore_i8
bumpmap
calibrate_rast
+condrender
copypixrate
crossbar
cva
drawbuffers
+drawbuffers2
extfuncs.h
exactrast
fbotest1
diff --git a/progs/tests/arraytexture.c b/progs/tests/arraytexture.c
index 28252a354bf..e4e86b9b4ce 100644
--- a/progs/tests/arraytexture.c
+++ b/progs/tests/arraytexture.c
@@ -36,7 +36,6 @@
#include <math.h>
#include <GL/glew.h>
#include <GL/glut.h>
-#include <GL/glext.h>
#if !defined(GL_EXT_texture_array) && !defined(GL_MESA_texture_array)
# error "This demo requires enums for either GL_EXT_texture_array or GL_MESA_texture_array to build."
diff --git a/progs/tests/bufferobj.c b/progs/tests/bufferobj.c
index d4ca2700160..dc479af0452 100644
--- a/progs/tests/bufferobj.c
+++ b/progs/tests/bufferobj.c
@@ -29,6 +29,7 @@ struct object
GLuint VertexStride;
GLuint ColorStride;
GLuint NumElements;
+ GLuint MaxElement;
};
static struct object Objects[NUM_OBJECTS];
@@ -58,7 +59,8 @@ static void DrawObject( const struct object *obj )
if (obj->NumElements > 0) {
/* indexed arrays */
glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, obj->ElementsBufferID);
- glDrawElements(GL_LINE_LOOP, obj->NumElements, GL_UNSIGNED_INT, NULL);
+ glDrawRangeElements(GL_LINE_LOOP, 0, obj->MaxElement,
+ obj->NumElements, GL_UNSIGNED_INT, NULL);
}
else {
/* non-indexed arrays */
@@ -300,6 +302,7 @@ static void MakeObject1(struct object *obj)
obj->VertexStride = 0;
obj->ColorStride = 0;
obj->NumElements = 0;
+ obj->MaxElement = 0;
glUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
@@ -345,6 +348,7 @@ static void MakeObject2(struct object *obj)
obj->ColorStride = 6 * sizeof(GLfloat);
obj->NumElements = 0;
+ obj->MaxElement = 0;
glUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
@@ -401,6 +405,7 @@ static void MakeObject3(struct object *obj)
i[3] = 3;
glUnmapBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB);
obj->NumElements = 4;
+ obj->MaxElement = 3;
if (Have_ARB_vertex_array_object) {
CreateVertexArrayObject(obj);
@@ -445,6 +450,7 @@ static void MakeObject4(struct object *obj)
/* Setup a buffer of indices to test the ELEMENTS path */
obj->ElementsBufferID = 0;
obj->NumElements = 0;
+ obj->MaxElement = 0;
if (Have_ARB_vertex_array_object) {
CreateVertexArrayObject(obj);
diff --git a/progs/tests/bug_3195.c b/progs/tests/bug_3195.c
index a075b94e370..3574c1f7176 100644
--- a/progs/tests/bug_3195.c
+++ b/progs/tests/bug_3195.c
@@ -38,7 +38,6 @@
#include <math.h>
#include <GL/glew.h>
#include <GL/glut.h>
-#include <GL/glext.h>
#include "readtex.h"
diff --git a/progs/tests/cva.c b/progs/tests/cva.c
index 02d1dcba2ec..b3e041c21e3 100644
--- a/progs/tests/cva.c
+++ b/progs/tests/cva.c
@@ -17,7 +17,6 @@
#define GL_GLEXT_LEGACY
#include <GL/glew.h>
#include <GL/glut.h>
-#include <GL/glext.h>
GLfloat verts[][4] = {
{ -0.5, -0.5, -2.0, 0.0 },
diff --git a/progs/tests/mipgen.c b/progs/tests/mipgen.c
index 088f643215c..48e52c9c315 100644
--- a/progs/tests/mipgen.c
+++ b/progs/tests/mipgen.c
@@ -48,8 +48,6 @@
#include <GL/glew.h>
#include <GL/glut.h>
-#include "readtex.h"
-
static GLfloat LodBias = 6.0; /* make smallest miplevel visible */
static GLuint texImage;
diff --git a/progs/tests/mipmap_comp.c b/progs/tests/mipmap_comp.c
index dd2232113b6..122d157949a 100644
--- a/progs/tests/mipmap_comp.c
+++ b/progs/tests/mipmap_comp.c
@@ -48,8 +48,6 @@
#include <GL/glew.h>
#include <GL/glut.h>
-#include "readtex.h"
-
#define SIZE 16 /* not larger then 16 */
static GLint BaseLevel = 0, MaxLevel = 9;
diff --git a/progs/tests/mipmap_comp_tests.c b/progs/tests/mipmap_comp_tests.c
index e865b30ad0f..b93a5c61393 100644
--- a/progs/tests/mipmap_comp_tests.c
+++ b/progs/tests/mipmap_comp_tests.c
@@ -48,8 +48,6 @@
#include <GL/glew.h>
#include <GL/glut.h>
-#include "readtex.h"
-
#define SIZE 16 /* not larger then 16 */
static GLint BaseLevel = 0, MaxLevel ;
diff --git a/progs/tests/mipmap_view.c b/progs/tests/mipmap_view.c
index 808d348699c..eb521970524 100644
--- a/progs/tests/mipmap_view.c
+++ b/progs/tests/mipmap_view.c
@@ -12,7 +12,6 @@
#include <math.h>
#include <GL/glew.h>
#include <GL/glut.h>
-#include <GL/glext.h>
#include "readtex.h"
diff --git a/progs/tests/no_s3tc.c b/progs/tests/no_s3tc.c
index 31cfb40b9d3..c4132cd956a 100644
--- a/progs/tests/no_s3tc.c
+++ b/progs/tests/no_s3tc.c
@@ -40,7 +40,6 @@
#include <string.h>
#include <GL/glew.h>
#include <GL/glut.h>
-#include <GL/glext.h>
static unsigned data[16];
diff --git a/progs/tests/streaming_rect.c b/progs/tests/streaming_rect.c
index f65ac4ce36c..3b016e55af9 100644
--- a/progs/tests/streaming_rect.c
+++ b/progs/tests/streaming_rect.c
@@ -13,8 +13,6 @@
#include <GL/glew.h>
#include <GL/glut.h>
-#include "readtex.h"
-
#define ANIMATE 10
#define PBO 11
diff --git a/progs/tests/zcomp.c b/progs/tests/zcomp.c
index 15e35f17b09..d6b9c070223 100644
--- a/progs/tests/zcomp.c
+++ b/progs/tests/zcomp.c
@@ -7,7 +7,6 @@
#include <math.h>
#include <GL/glew.h>
#include <GL/glut.h>
-#include "../util/showbuffer.c"
static int Win;