Module: Mesa
Branch: master
Commit: ad9c1838e0e096ab8aafadd65fa93e55259ec587
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ad9c1838e0e096ab8aafadd65fa93e55259ec587
Author: Adam Jackson <a...@redhat.com>
Date: Fri Aug 23 12:51:08 2019 -0400
glx: Remove unused indirection for glx_context->fillImage
This slot is always filled in with __glFillImage.
Reviewed-by: Michel Dänzer <mdaen...@redhat.com>
Reviewed-by: Eric Anholt <e...@anholt.net>
---
src/glx/glxclient.h | 7 -------
src/glx/indirect_glx.c | 4 ----
src/glx/renderpix.c | 19 +++++++++----------
src/mapi/glapi/gen/glX_proto_send.py | 2 +-
4 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 2a7437fcd1b..41edf17210f 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -328,13 +328,6 @@ struct glx_context
/*@} */
/**
- * Fill newImage with the unpacked form of \c oldImage getting it
- * ready for transport to the server.
- */
- void (*fillImage) (struct glx_context *, GLint, GLint, GLint, GLint, GLenum,
- GLenum, const GLvoid *, GLubyte *, GLubyte *);
-
- /**
* Client side attribs.
*/
__GLXattributeMachine attributes;
diff --git a/src/glx/indirect_glx.c b/src/glx/indirect_glx.c
index cfae12f6c0d..d4a0b640ada 100644
--- a/src/glx/indirect_glx.c
+++ b/src/glx/indirect_glx.c
@@ -399,10 +399,6 @@ indirect_create_context(struct glx_screen *psc,
gc->attributes.stackPointer = &gc->attributes.stack[0];
- /*
- ** PERFORMANCE NOTE: A mode dependent fill image can speed things up.
- */
- gc->fillImage = __glFillImage;
gc->pc = gc->buf;
gc->bufEnd = gc->buf + bufSize;
gc->isDirect = GL_FALSE;
diff --git a/src/glx/renderpix.c b/src/glx/renderpix.c
index a88b544c764..e367a9349c5 100644
--- a/src/glx/renderpix.c
+++ b/src/glx/renderpix.c
@@ -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) {
- (*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) {
@@ -147,13 +147,12 @@ __indirect_glSeparableFilter2D(GLenum target, GLenum
internalformat,
__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) {
- (*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)) {
@@ -183,11 +182,11 @@ __indirect_glSeparableFilter2D(GLenum target, GLenum
internalformat,
__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,
diff --git a/src/mapi/glapi/gen/glX_proto_send.py
b/src/mapi/glapi/gen/glX_proto_send.py
index 03067d8a3cd..a269ff2068d 100644
--- a/src/mapi/glapi/gen/glX_proto_send.py
+++ b/src/mapi/glapi/gen/glX_proto_send.py
@@ -573,7 +573,7 @@ generic_%u_byte( GLint rop, const void * ptr )
condition = 'compsize > 0'
print('if (%s) {' % (condition))
- print(' gc->fillImage(gc, %s, %s, %s, %s, %s, %s, %s,
%s, %s);' % (dim_str, width, height, depth, param.img_format, param.img_type,
param.name, pcPtr, pixHeaderPtr))
+ print(' __glFillImage(gc, %s, %s, %s, %s, %s, %s, %s,
%s, %s);' % (dim_str, width, height, depth, param.img_format, param.img_type,
param.name, pcPtr, pixHeaderPtr))
print('} else {')
print(' (void) memcpy( %s, default_pixel_store_%uD,
default_pixel_store_%uD_size );' % (pixHeaderPtr, dim, dim))
print('}')
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
