projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "glx: Implement GLX_EXT_no_config_context"
[mesa.git]
/
src
/
glx
/
renderpix.c
diff --git
a/src/glx/renderpix.c
b/src/glx/renderpix.c
index b54f115595967ef455faa333da6a17bab609a79f..e367a9349c588e1d0cfeeca6eeb483236d616f39 100644
(file)
--- a/
src/glx/renderpix.c
+++ b/
src/glx/renderpix.c
@@
-84,7
+84,7
@@
__glXSendLargeImage(struct glx_context * gc, GLint compsize, GLint dim,
GLubyte * pc, GLubyte * modes)
{
/* Allocate a temporary holding buffer */
GLubyte * pc, GLubyte * modes)
{
/* Allocate a temporary holding buffer */
- GLubyte *buf =
(GLubyte *) X
malloc(compsize);
+ GLubyte *buf = malloc(compsize);
if (!buf) {
__glXSetError(gc, GL_OUT_OF_MEMORY);
return;
if (!buf) {
__glXSetError(gc, GL_OUT_OF_MEMORY);
return;
@@
-92,8
+92,8
@@
__glXSendLargeImage(struct glx_context * gc, GLint compsize, GLint dim,
/* Apply pixel store unpack modes to copy data into buf */
if (src != NULL) {
/* Apply pixel store unpack modes to copy data into buf */
if (src != NULL) {
-
(*gc->fillImage)
(gc, dim, width, height, depth, format, type,
-
src, buf, modes);
+
__glFillImage
(gc, dim, width, height, depth, format, type,
+ src, buf, modes);
}
else {
if (dim < 3) {
}
else {
if (dim < 3) {
@@
-108,7
+108,7
@@
__glXSendLargeImage(struct glx_context * gc, GLint compsize, GLint dim,
__glXSendLargeCommand(gc, gc->pc, pc - gc->pc, buf, compsize);
/* Free buffer */
__glXSendLargeCommand(gc, gc->pc, pc - gc->pc, buf, compsize);
/* Free buffer */
-
X
free((char *) buf);
+ free((char *) buf);
}
/************************************************************************/
}
/************************************************************************/
@@
-147,13
+147,12
@@
__indirect_glSeparableFilter2D(GLenum target, GLenum internalformat,
__GLX_PUT_LONG(20, type);
pc += hdrlen;
if (compsize > 0) {
__GLX_PUT_LONG(20, type);
pc += hdrlen;
if (compsize > 0) {
-
(*gc->fillImage) (gc, 1, width, 1, 1, format, type
,
-
row, pc,
pixelHeaderPC);
+
__glFillImage(gc, 1, width, 1, 1, format, type, row, pc
,
+ pixelHeaderPC);
pc += image1len;
}
if (compsize2 > 0) {
pc += image1len;
}
if (compsize2 > 0) {
- (*gc->fillImage) (gc, 1, height, 1, 1, format, type,
- column, pc, NULL);
+ __glFillImage(gc, 1, height, 1, 1, format, type, column, pc, NULL);
pc += image2len;
}
if ((compsize == 0) && (compsize2 == 0)) {
pc += image2len;
}
if ((compsize == 0) && (compsize2 == 0)) {
@@
-178,21
+177,21
@@
__indirect_glSeparableFilter2D(GLenum target, GLenum internalformat,
pc += hdrlen;
/* Allocate a temporary holding buffer */
pc += hdrlen;
/* Allocate a temporary holding buffer */
- buf =
(GLubyte *) X
malloc(bufsize);
+ buf = malloc(bufsize);
if (!buf) {
__glXSetError(gc, GL_OUT_OF_MEMORY);
return;
}
if (!buf) {
__glXSetError(gc, GL_OUT_OF_MEMORY);
return;
}
-
(*gc->fillImage)
(gc, 1, width, 1, 1, format, type, row, buf,
-
pixelHeaderPC);
+
__glFillImage
(gc, 1, width, 1, 1, format, type, row, buf,
+ pixelHeaderPC);
-
(*gc->fillImage)
(gc, 1, height, 1, 1, format, type, column,
-
buf + image1len, pixelHeaderPC);
+
__glFillImage
(gc, 1, height, 1, 1, format, type, column,
+ buf + image1len, pixelHeaderPC);
/* Send large command */
__glXSendLargeCommand(gc, gc->pc, (GLint) (pc - gc->pc), buf,
bufsize);
/* Free buffer */
/* Send large command */
__glXSendLargeCommand(gc, gc->pc, (GLint) (pc - gc->pc), buf,
bufsize);
/* Free buffer */
-
X
free((char *) buf);
+ free((char *) buf);
}
}
}
}