projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "glx: Unset the direct_support bit for GLX_EXT_import_context"
[mesa.git]
/
src
/
glx
/
pixelstore.c
diff --git
a/src/glx/pixelstore.c
b/src/glx/pixelstore.c
index 8b51b5d8b7f947a964c62ae1c53df8c21d0d58c9..dc33ff300fce78bd00208a56eecdd42e23318589 100644
(file)
--- a/
src/glx/pixelstore.c
+++ b/
src/glx/pixelstore.c
@@
-30,8
+30,9
@@
#include "glxclient.h"
#include "indirect.h"
#include "glxclient.h"
#include "indirect.h"
+#include "util/rounding.h"
-#if !defined
__GNUC__ || __GNUC__ < 3
+#if !defined
(__GNUC__)
# define __builtin_expect(x, y) x
#endif
# define __builtin_expect(x, y) x
#endif
@@
-46,7
+47,7
@@
* \sa __indirect_glPixelStorei, __indirect_glPixelStoref
*/
static void
* \sa __indirect_glPixelStorei, __indirect_glPixelStoref
*/
static void
-send_PixelStore(
__GLX
context * gc, unsigned sop, GLenum pname,
+send_PixelStore(
struct glx_
context * gc, unsigned sop, GLenum pname,
const void *param)
{
Display *const dpy = gc->currentDpy;
const void *param)
{
Display *const dpy = gc->currentDpy;
@@
-67,7
+68,7
@@
send_PixelStore(__GLXcontext * gc, unsigned sop, GLenum pname,
void
__indirect_glPixelStoref(GLenum pname, GLfloat param)
{
void
__indirect_glPixelStoref(GLenum pname, GLfloat param)
{
-
__GLX
context *gc = __glXGetCurrentContext();
+
struct glx_
context *gc = __glXGetCurrentContext();
__GLXattribute *state = gc->client_state_private;
Display *dpy = gc->currentDpy;
GLuint a;
__GLXattribute *state = gc->client_state_private;
Display *dpy = gc->currentDpy;
GLuint a;
@@
-77,7
+78,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
switch (pname) {
case GL_PACK_ROW_LENGTH:
switch (pname) {
case GL_PACK_ROW_LENGTH:
- a =
(GLuint) (param + 0.5
);
+ a =
_mesa_lroundevenf(param
);
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
@@
-85,7
+86,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
state->storePack.rowLength = a;
break;
case GL_PACK_IMAGE_HEIGHT:
state->storePack.rowLength = a;
break;
case GL_PACK_IMAGE_HEIGHT:
- a =
(GLuint) (param + 0.5
);
+ a =
_mesa_lroundevenf(param
);
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
@@
-93,7
+94,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
state->storePack.imageHeight = a;
break;
case GL_PACK_SKIP_ROWS:
state->storePack.imageHeight = a;
break;
case GL_PACK_SKIP_ROWS:
- a =
(GLuint) (param + 0.5
);
+ a =
_mesa_lroundevenf(param
);
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
@@
-101,7
+102,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
state->storePack.skipRows = a;
break;
case GL_PACK_SKIP_PIXELS:
state->storePack.skipRows = a;
break;
case GL_PACK_SKIP_PIXELS:
- a =
(GLuint) (param + 0.5
);
+ a =
_mesa_lroundevenf(param
);
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
@@
-109,7
+110,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
state->storePack.skipPixels = a;
break;
case GL_PACK_SKIP_IMAGES:
state->storePack.skipPixels = a;
break;
case GL_PACK_SKIP_IMAGES:
- a =
(GLuint) (param + 0.5
);
+ a =
_mesa_lroundevenf(param
);
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
@@
-117,7
+118,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
state->storePack.skipImages = a;
break;
case GL_PACK_ALIGNMENT:
state->storePack.skipImages = a;
break;
case GL_PACK_ALIGNMENT:
- a =
(GLint) (param + 0.5
);
+ a =
_mesa_lroundevenf(param
);
switch (a) {
case 1:
case 2:
switch (a) {
case 1:
case 2:
@@
-138,7
+139,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
break;
case GL_UNPACK_ROW_LENGTH:
break;
case GL_UNPACK_ROW_LENGTH:
- a =
(GLuint) (param + 0.5
);
+ a =
_mesa_lroundevenf(param
);
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
@@
-146,7
+147,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
state->storeUnpack.rowLength = a;
break;
case GL_UNPACK_IMAGE_HEIGHT:
state->storeUnpack.rowLength = a;
break;
case GL_UNPACK_IMAGE_HEIGHT:
- a =
(GLuint) (param + 0.5
);
+ a =
_mesa_lroundevenf(param
);
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
@@
-154,7
+155,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
state->storeUnpack.imageHeight = a;
break;
case GL_UNPACK_SKIP_ROWS:
state->storeUnpack.imageHeight = a;
break;
case GL_UNPACK_SKIP_ROWS:
- a =
(GLuint) (param + 0.5
);
+ a =
_mesa_lroundevenf(param
);
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
@@
-162,7
+163,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
state->storeUnpack.skipRows = a;
break;
case GL_UNPACK_SKIP_PIXELS:
state->storeUnpack.skipRows = a;
break;
case GL_UNPACK_SKIP_PIXELS:
- a =
(GLuint) (param + 0.5
);
+ a =
_mesa_lroundevenf(param
);
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
@@
-170,7
+171,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
state->storeUnpack.skipPixels = a;
break;
case GL_UNPACK_SKIP_IMAGES:
state->storeUnpack.skipPixels = a;
break;
case GL_UNPACK_SKIP_IMAGES:
- a =
(GLuint) (param + 0.5
);
+ a =
_mesa_lroundevenf(param
);
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
if (((GLint) a) < 0) {
__glXSetError(gc, GL_INVALID_VALUE);
return;
@@
-178,7
+179,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
state->storeUnpack.skipImages = a;
break;
case GL_UNPACK_ALIGNMENT:
state->storeUnpack.skipImages = a;
break;
case GL_UNPACK_ALIGNMENT:
- a =
(GLint) (param + 0.5
);
+ a =
_mesa_lroundevenf(param
);
switch (a) {
case 1:
case 2:
switch (a) {
case 1:
case 2:
@@
-217,7
+218,7
@@
__indirect_glPixelStoref(GLenum pname, GLfloat param)
void
__indirect_glPixelStorei(GLenum pname, GLint param)
{
void
__indirect_glPixelStorei(GLenum pname, GLint param)
{
-
__GLX
context *gc = __glXGetCurrentContext();
+
struct glx_
context *gc = __glXGetCurrentContext();
__GLXattribute *state = gc->client_state_private;
Display *dpy = gc->currentDpy;
__GLXattribute *state = gc->client_state_private;
Display *dpy = gc->currentDpy;