projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: implement glGet for AMD_framebuffer_multisample_advanced
[mesa.git]
/
src
/
mesa
/
main
/
eval.c
diff --git
a/src/mesa/main/eval.c
b/src/mesa/main/eval.c
index 349331f00025bbfe7a700e51b106fad2ed480264..86c8f75a1d25df5542d79fcf6378b80998e7cf46 100644
(file)
--- a/
src/mesa/main/eval.c
+++ b/
src/mesa/main/eval.c
@@
-1,7
+1,6
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version: 5.1
*
* Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
*
* Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
@@
-40,7
+39,6
@@
#include "glheader.h"
#include "imports.h"
#include "glheader.h"
#include "imports.h"
-#include "colormac.h"
#include "context.h"
#include "eval.h"
#include "macros.h"
#include "context.h"
#include "eval.h"
#include "macros.h"
@@
-311,7
+309,7
@@
map1(GLenum target, GLfloat u1, GLfloat u2, GLint ustride,
GLfloat *pnts;
struct gl_1d_map *map = NULL;
GLfloat *pnts;
struct gl_1d_map *map = NULL;
-
ASSERT
(type == GL_FLOAT || type == GL_DOUBLE);
+
assert
(type == GL_FLOAT || type == GL_DOUBLE);
if (u1 == u2) {
_mesa_error( ctx, GL_INVALID_VALUE, "glMap1(u1,u2)" );
if (u1 == u2) {
_mesa_error( ctx, GL_INVALID_VALUE, "glMap1(u1,u2)" );
@@
-393,7
+391,7
@@
map2( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
GLfloat *pnts;
struct gl_2d_map *map = NULL;
GLfloat *pnts;
struct gl_2d_map *map = NULL;
-
ASSERT
(type == GL_FLOAT || type == GL_DOUBLE);
+
assert
(type == GL_FLOAT || type == GL_DOUBLE);
if (u1==u2) {
_mesa_error( ctx, GL_INVALID_VALUE, "glMap2(u1,u2)" );
if (u1==u2) {
_mesa_error( ctx, GL_INVALID_VALUE, "glMap2(u1,u2)" );
@@
-507,7
+505,7
@@
_mesa_GetnMapdvARB( GLenum target, GLenum query, GLsizei bufSize, GLdouble *v )
map1d = get_1d_map(ctx, target);
map2d = get_2d_map(ctx, target);
map1d = get_1d_map(ctx, target);
map2d = get_2d_map(ctx, target);
-
ASSERT
(map1d || map2d);
+
assert
(map1d || map2d);
switch (query) {
case GL_COEFF:
switch (query) {
case GL_COEFF:
@@
-597,7
+595,7
@@
_mesa_GetnMapfvARB( GLenum target, GLenum query, GLsizei bufSize, GLfloat *v )
map1d = get_1d_map(ctx, target);
map2d = get_2d_map(ctx, target);
map1d = get_1d_map(ctx, target);
map2d = get_2d_map(ctx, target);
-
ASSERT
(map1d || map2d);
+
assert
(map1d || map2d);
switch (query) {
case GL_COEFF:
switch (query) {
case GL_COEFF:
@@
-689,7
+687,7
@@
_mesa_GetnMapivARB( GLenum target, GLenum query, GLsizei bufSize, GLint *v )
map1d = get_1d_map(ctx, target);
map2d = get_2d_map(ctx, target);
map1d = get_1d_map(ctx, target);
map2d = get_2d_map(ctx, target);
-
ASSERT
(map1d || map2d);
+
assert
(map1d || map2d);
switch (query) {
case GL_COEFF:
switch (query) {
case GL_COEFF: