OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark GenQueriesARB at 'always_array="true"'. This eliminates the need

Browse Source 
to special-case the handling of that function in glX_proto_send.py.
This commit is contained in:
Ian Romanick
2005-06-22 17:11:20 +00:00
parent 814e5360b0
commit 2636e853f6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/glx/x11/indirect.c
View File

@@ -7624,12 +7624,12 @@ __indirect_glGenQueriesARB(GLsizei n, GLuint * ids)
XCBConnection *c = XCBConnectionOfDisplay(dpy); XCBConnection *c = XCBConnectionOfDisplay(dpy);
(void) __glXFlushRenderBuffer(gc, gc->pc); (void) __glXFlushRenderBuffer(gc, gc->pc);
XCBGlxGenQueriesARBRep *reply = XCBGlxGenQueriesARBReply(c, XCBGlxGenQueriesARB(c, gc->currentContextTag, n), NULL); XCBGlxGenQueriesARBRep *reply = XCBGlxGenQueriesARBReply(c, XCBGlxGenQueriesARB(c, gc->currentContextTag, n), NULL);
(void)memcpy(ids, XCBGlxGenQueriesARBData(reply), XCBGlxGenQueriesARBDataLength(reply) * sizeof(GLuint)); ids = (GLuint *)XCBGlxGenQueriesARBData(reply);
free(reply); free(reply);
#else #else
GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GenQueriesARB, cmdlen); GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GenQueriesARB, cmdlen);
(void) memcpy((void *)(pc + 0), (void *)(&n), 4); (void) memcpy((void *)(pc + 0), (void *)(&n), 4);
(void) __glXReadReply(dpy, 4, ids, GL_FALSE); (void) __glXReadReply(dpy, 4, ids, GL_TRUE);
UnlockDisplay(dpy); SyncHandle(); UnlockDisplay(dpy); SyncHandle();
#endif /* USE_XCB */ #endif /* USE_XCB */
} }

2
src/mesa/glapi/glX_proto_send.py
View File

@@ -576,7 +576,7 @@ generic_%u_byte( GLint rop, const void * ptr )
if output and f.reply_always_array: if output and f.reply_always_array:
print ' %s = (%s)%sData(reply);' % (output.name, output.type_string(), xcb_name) print ' %s = (%s)%sData(reply);' % (output.name, output.type_string(), xcb_name)
elif output and not f.reply_always_array: elif output and not f.reply_always_array:
if not output.is_image() and not f.name == "GenQueriesARB": if not output.is_image():
print ' if (%sDataLength(reply) == 0)' % (xcb_name) print ' if (%sDataLength(reply) == 0)' % (xcb_name)
print ' (void)memcpy(%s, &reply->datum, sizeof(reply->datum));' % (output.name) print ' (void)memcpy(%s, &reply->datum, sizeof(reply->datum));' % (output.name)
print ' else' print ' else'

2
src/mesa/glapi/gl_API.xml
View File

@@ -6721,7 +6721,7 @@
<function name="GenQueriesARB" offset="700"> <function name="GenQueriesARB" offset="700">
<param name="n" type="GLsizei" counter="true"/> <param name="n" type="GLsizei" counter="true"/>
<param name="ids" type="GLuint *" output="true" count="n"/> <param name="ids" type="GLuint *" output="true" count="n"/>
<glx sop="162"/> <glx sop="162" always_array="true"/>
</function> </function>
<function name="DeleteQueriesARB" offset="701"> <function name="DeleteQueriesARB" offset="701">