date:20170816

Re: [PATCH xserver 3/3] glx: Remove some unused stuff from glxserver.h

2017-08-16 Thread Keith Packard

Adam Jackson  writes:

> Signed-off-by: Adam Jackson 

Reviewed-by: Keith Packard 

-- 
-keith


signature.asc
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver 1/3] glx: Remove True/False defines

2017-08-16 Thread Keith Packard

Adam Jackson  writes:

> Those are xlib spellings, we say TRUE/FALSE pretty consistently
> elsewhere in the server.
>
> Signed-off-by: Adam Jackson 

Reviewed-by: Keith Packard 

-- 
-keith


signature.asc
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver 1/3] glx: Remove True/False defines

2017-08-16 Thread Alex Deucher

On Wed, Aug 16, 2017 at 2:49 PM, Adam Jackson  wrote:
> Those are xlib spellings, we say TRUE/FALSE pretty consistently
> elsewhere in the server.
>
> Signed-off-by: Adam Jackson 

Series is:
Reviewed-by: Alex Deucher 

> ---
>  glx/createcontext.c| 16 
>  glx/glxdri2.c  | 16 
>  glx/glxext.c   | 16 
>  glx/glxserver.h|  7 ---
>  glx/indirect_program.c |  4 ++--
>  hw/xwin/glx/indirect.c |  2 +-
>  6 files changed, 27 insertions(+), 34 deletions(-)
>
> diff --git a/glx/createcontext.c b/glx/createcontext.c
> index 068b35fa7..1216f9412 100644
> --- a/glx/createcontext.c
> +++ b/glx/createcontext.c
> @@ -37,29 +37,29 @@ static Bool
>  validate_GL_version(int major_version, int minor_version)
>  {
>  if (major_version <= 0 || minor_version < 0)
> -return False;
> +return FALSE;
>
>  switch (major_version) {
>  case 1:
>  if (minor_version > 5)
> -return False;
> +return FALSE;
>  break;
>
>  case 2:
>  if (minor_version > 1)
> -return False;
> +return FALSE;
>  break;
>
>  case 3:
>  if (minor_version > 3)
> -return False;
> +return FALSE;
>  break;
>
>  default:
>  break;
>  }
>
> -return True;
> +return TRUE;
>  }
>
>  static Bool
> @@ -70,9 +70,9 @@ validate_render_type(uint32_t render_type)
>  case GLX_COLOR_INDEX_TYPE:
>  case GLX_RGBA_FLOAT_TYPE_ARB:
>  case GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT:
> -return True;
> +return TRUE;
>  default:
> -return False;
> +return FALSE;
>  }
>  }
>
> @@ -316,7 +316,7 @@ __glXDisp_CreateContextAttribsARB(__GLXclientState * cl, 
> GLbyte * pc)
>  ctx->config = config;
>  ctx->id = req->context;
>  ctx->share_id = req->shareList;
> -ctx->idExists = True;
> +ctx->idExists = TRUE;
>  ctx->isDirect = req->isDirect;
>  ctx->renderMode = GL_RENDER;
>  ctx->resetNotificationStrategy = reset;
> diff --git a/glx/glxdri2.c b/glx/glxdri2.c
> index 701944283..9961c1bfb 100644
> --- a/glx/glxdri2.c
> +++ b/glx/glxdri2.c
> @@ -344,11 +344,11 @@ dri2_convert_glx_attribs(__GLXDRIscreen *screen, 
> unsigned num_attribs,
>  unsigned i;
>
>  if (num_attribs == 0)
> -return True;
> +return TRUE;
>
>  if (attribs == NULL) {
>  *error = BadImplementation;
> -return False;
> +return FALSE;
>  }
>
>  *major_ver = 1;
> @@ -381,13 +381,13 @@ dri2_convert_glx_attribs(__GLXDRIscreen *screen, 
> unsigned num_attribs,
>  break;
>  default:
>  *error = __glXError(GLXBadProfileARB);
> -return False;
> +return FALSE;
>  }
>  break;
>  case GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB:
>  if (screen->dri2->base.version >= 4) {
>  *error = BadValue;
> -return False;
> +return FALSE;
>  }
>
>  switch (attribs[i * 2 + 1]) {
> @@ -399,14 +399,14 @@ dri2_convert_glx_attribs(__GLXDRIscreen *screen, 
> unsigned num_attribs,
>  break;
>  default:
>  *error = BadValue;
> -return False;
> +return FALSE;
>  }
>  break;
>  default:
>  /* If an unknown attribute is received, fail.
>   */
>  *error = BadValue;
> -return False;
> +return FALSE;
>  }
>  }
>
> @@ -414,7 +414,7 @@ dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned 
> num_attribs,
>   */
>  if ((*flags & ~ALL_DRI_CTX_FLAGS) != 0) {
>  *error = BadValue;
> -return False;
> +return FALSE;
>  }
>
>  /* If the core profile is requested for a GL version is less than 3.2,
> @@ -428,7 +428,7 @@ dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned 
> num_attribs,
>  }
>
>  *error = Success;
> -return True;
> +return TRUE;
>  }
>
>  static void
> diff --git a/glx/glxext.c b/glx/glxext.c
> index e88bbd107..9b4d81641 100644
> --- a/glx/glxext.c
> +++ b/glx/glxext.c
> @@ -97,7 +97,7 @@ ContextGone(__GLXcontext * cx, XID id)
>  __glXFreeContext(cx);
>  }
>
> -return True;
> +return TRUE;
>  }
>
>  static __GLXcontext *glxPendingDestroyContexts;
> @@ -146,7 +146,7 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid)
>
>  glxPriv->destroy(glxPriv);
>
> -return True;
> +return TRUE;
>  }
>
>  Bool
> @@ -155,12 +155,12 @@ __glXAddContext(__GLXcontext * cx)
>  /* Register this context as a resource.
>   */
>  if (!AddResource(cx->id, __glXContextRes, (void *)cx)) {
> -   return False;
> +   return FALSE;
>  }
>
>  cx->next =

[PATCH xserver 2/3] glx: Inline some reply swapping code

2017-08-16 Thread Adam Jackson

Signed-off-by: Adam Jackson 
---
 glx/glxcmds.c |  68 ++-
 glx/glxcmdsswap.c | 103 --
 glx/glxserver.h   |  22 
 3 files changed, 52 insertions(+), 141 deletions(-)

diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 9ad90eec2..6a763970d 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -685,11 +685,12 @@ DoMakeCurrent(__GLXclientState * cl,
 }
 
 if (client->swapped) {
-__glXSwapMakeCurrentReply(client, );
-}
-else {
-WriteToClient(client, sz_xGLXMakeCurrentReply, );
+__GLX_DECLARE_SWAP_VARIABLES;
+__GLX_SWAP_SHORT();
+__GLX_SWAP_INT();
+__GLX_SWAP_INT();
 }
+WriteToClient(client, sz_xGLXMakeCurrentReply, );
 return Success;
 }
 
@@ -751,11 +752,11 @@ __glXDisp_IsDirect(__GLXclientState * cl, GLbyte * pc)
 };
 
 if (client->swapped) {
-__glXSwapIsDirectReply(client, );
-}
-else {
-WriteToClient(client, sz_xGLXIsDirectReply, );
+__GLX_DECLARE_SWAP_VARIABLES;
+__GLX_SWAP_SHORT();
+__GLX_SWAP_INT();
 }
+WriteToClient(client, sz_xGLXIsDirectReply, );
 
 return Success;
 }
@@ -789,11 +790,14 @@ __glXDisp_QueryVersion(__GLXclientState * cl, GLbyte * pc)
 };
 
 if (client->swapped) {
-__glXSwapQueryVersionReply(client, );
-}
-else {
-WriteToClient(client, sz_xGLXQueryVersionReply, );
+__GLX_DECLARE_SWAP_VARIABLES;
+__GLX_SWAP_SHORT();
+__GLX_SWAP_INT();
+__GLX_SWAP_INT();
+__GLX_SWAP_INT();
 }
+
+WriteToClient(client, sz_xGLXQueryVersionReply, );
 return Success;
 }
 
@@ -1738,7 +1742,16 @@ DoQueryContext(__GLXclientState * cl, GLXContextID gcId)
 sendBuf[5] = (int) (ctx->pGlxScreen->pScreen->myNum);
 
 if (client->swapped) {
-__glXSwapQueryContextInfoEXTReply(client, , sendBuf);
+int length = reply.length;
+
+__GLX_DECLARE_SWAP_VARIABLES;
+__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+__GLX_SWAP_SHORT();
+__GLX_SWAP_INT();
+__GLX_SWAP_INT();
+WriteToClient(client, sz_xGLXQueryContextInfoEXTReply, );
+__GLX_SWAP_INT_ARRAY((int *) sendBuf, length);
+WriteToClient(client, length << 2, sendBuf);
 }
 else {
 WriteToClient(client, sz_xGLXQueryContextInfoEXTReply, );
@@ -1968,7 +1981,16 @@ DoGetDrawableAttributes(__GLXclientState * cl, XID 
drawId)
 };
 
 if (client->swapped) {
-__glXSwapGetDrawableAttributesReply(client, , attributes);
+int length = reply.length;
+
+__GLX_DECLARE_SWAP_VARIABLES;
+__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+__GLX_SWAP_SHORT();
+__GLX_SWAP_INT();
+__GLX_SWAP_INT();
+WriteToClient(client, sz_xGLXGetDrawableAttributesReply, );
+__GLX_SWAP_INT_ARRAY((int *) attributes, length);
+WriteToClient(client, length << 2, attributes);
 }
 else {
 WriteToClient(client, sz_xGLXGetDrawableAttributesReply, );
@@ -2415,7 +2437,14 @@ __glXDisp_QueryExtensionsString(__GLXclientState * cl, 
GLbyte * pc)
 memcpy(buf, pGlxScreen->GLXextensions, n);
 
 if (client->swapped) {
-glxSwapQueryExtensionsStringReply(client, , buf);
+__GLX_DECLARE_SWAP_VARIABLES;
+__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+__GLX_SWAP_SHORT();
+__GLX_SWAP_INT();
+__GLX_SWAP_INT();
+WriteToClient(client, sz_xGLXQueryExtensionsStringReply, );
+__GLX_SWAP_INT_ARRAY((int *) buf, length);
+WriteToClient(client, length << 2, buf);
 }
 else {
 WriteToClient(client, sz_xGLXQueryExtensionsStringReply, );
@@ -2483,7 +2512,14 @@ __glXDisp_QueryServerString(__GLXclientState * cl, 
GLbyte * pc)
 memcpy(buf, ptr, n);
 
 if (client->swapped) {
-glxSwapQueryServerStringReply(client, , buf);
+__GLX_DECLARE_SWAP_VARIABLES;
+__GLX_SWAP_SHORT();
+__GLX_SWAP_INT();
+__GLX_SWAP_INT();
+WriteToClient(client, sz_xGLXQueryServerStringReply, );
+/** no swap is needed for an array of chars **/
+/* __GLX_SWAP_INT_ARRAY((int *)buf, length); */
+WriteToClient(client, length << 2, buf);
 }
 else {
 WriteToClient(client, sz_xGLXQueryServerStringReply, );
diff --git a/glx/glxcmdsswap.c b/glx/glxcmdsswap.c
index 9ec1222f8..44a09e61c 100644
--- a/glx/glxcmdsswap.c
+++ b/glx/glxcmdsswap.c
@@ -826,109 +826,6 @@ __glXDispSwap_GetDrawableAttributes(__GLXclientState * 
cl, GLbyte * pc)
 //
 
 /*
-** Swap replies.
-*/
-
-void
-__glXSwapMakeCurrentReply(ClientPtr client, xGLXMakeCurrentReply * reply)
-{
-__GLX_DECLARE_SWAP_VARIABLES;
-__GLX_SWAP_SHORT(>sequenceNumber);
-__GLX_SWAP_INT(>length);
-__GLX_SWAP_INT(>contextTag);
-WriteToClient(client, sz_xGLXMakeCurrentReply,

[PATCH xserver 3/3] glx: Remove some unused stuff from glxserver.h

2017-08-16 Thread Adam Jackson

Signed-off-by: Adam Jackson 
---
 glx/glxserver.h | 13 -
 glx/single2.c   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/glx/glxserver.h b/glx/glxserver.h
index a54ce4b92..31c635b97 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -54,7 +54,6 @@
 ** GLX resources.
 */
 typedef XID GLXContextID;
-typedef XID GLXPixmap;
 typedef XID GLXDrawable;
 
 typedef struct __GLXclientStateRec __GLXclientState;
@@ -156,11 +155,6 @@ typedef int (*__GLXdispatchSingleProcPtr) 
(__GLXclientState *, GLbyte *);
 typedef int (*__GLXdispatchVendorPrivProcPtr) (__GLXclientState *, GLbyte *);
 
 /*
- * Dispatch for GLX commands.
- */
-typedef int (*__GLXprocPtr) (__GLXclientState *, char *pc);
-
-/*
  * Tables for computing the size of each rendering command.
  */
 typedef int (*gl_proto_size_func) (const GLbyte *, Bool, int);
@@ -177,18 +171,11 @@ typedef struct {
 */
 extern RESTYPE __glXContextRes;
 extern RESTYPE __glXClientRes;
-extern RESTYPE __glXPixmapRes;
 extern RESTYPE __glXDrawableRes;
 
 //
 
 /*
-** Prototypes.
-*/
-
-extern char *__glXcombine_strings(const char *, const char *);
-
-/*
  * Routines for computing the size of variably-sized rendering commands.
  */
 
diff --git a/glx/single2.c b/glx/single2.c
index e7488194b..36a01f0cb 100644
--- a/glx/single2.c
+++ b/glx/single2.c
@@ -253,7 +253,7 @@ __glXDisp_Finish(__GLXclientState * cl, GLbyte * pc)
 
 #define SEPARATOR " "
 
-char *
+static char *
 __glXcombine_strings(const char *cext_string, const char *sext_string)
 {
 size_t clen, slen;
-- 
2.13.4

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver 1/3] glx: Remove True/False defines

2017-08-16 Thread Adam Jackson

Those are xlib spellings, we say TRUE/FALSE pretty consistently
elsewhere in the server.

Signed-off-by: Adam Jackson 
---
 glx/createcontext.c| 16 
 glx/glxdri2.c  | 16 
 glx/glxext.c   | 16 
 glx/glxserver.h|  7 ---
 glx/indirect_program.c |  4 ++--
 hw/xwin/glx/indirect.c |  2 +-
 6 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/glx/createcontext.c b/glx/createcontext.c
index 068b35fa7..1216f9412 100644
--- a/glx/createcontext.c
+++ b/glx/createcontext.c
@@ -37,29 +37,29 @@ static Bool
 validate_GL_version(int major_version, int minor_version)
 {
 if (major_version <= 0 || minor_version < 0)
-return False;
+return FALSE;
 
 switch (major_version) {
 case 1:
 if (minor_version > 5)
-return False;
+return FALSE;
 break;
 
 case 2:
 if (minor_version > 1)
-return False;
+return FALSE;
 break;
 
 case 3:
 if (minor_version > 3)
-return False;
+return FALSE;
 break;
 
 default:
 break;
 }
 
-return True;
+return TRUE;
 }
 
 static Bool
@@ -70,9 +70,9 @@ validate_render_type(uint32_t render_type)
 case GLX_COLOR_INDEX_TYPE:
 case GLX_RGBA_FLOAT_TYPE_ARB:
 case GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT:
-return True;
+return TRUE;
 default:
-return False;
+return FALSE;
 }
 }
 
@@ -316,7 +316,7 @@ __glXDisp_CreateContextAttribsARB(__GLXclientState * cl, 
GLbyte * pc)
 ctx->config = config;
 ctx->id = req->context;
 ctx->share_id = req->shareList;
-ctx->idExists = True;
+ctx->idExists = TRUE;
 ctx->isDirect = req->isDirect;
 ctx->renderMode = GL_RENDER;
 ctx->resetNotificationStrategy = reset;
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 701944283..9961c1bfb 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -344,11 +344,11 @@ dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned 
num_attribs,
 unsigned i;
 
 if (num_attribs == 0)
-return True;
+return TRUE;
 
 if (attribs == NULL) {
 *error = BadImplementation;
-return False;
+return FALSE;
 }
 
 *major_ver = 1;
@@ -381,13 +381,13 @@ dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned 
num_attribs,
 break;
 default:
 *error = __glXError(GLXBadProfileARB);
-return False;
+return FALSE;
 }
 break;
 case GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB:
 if (screen->dri2->base.version >= 4) {
 *error = BadValue;
-return False;
+return FALSE;
 }
 
 switch (attribs[i * 2 + 1]) {
@@ -399,14 +399,14 @@ dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned 
num_attribs,
 break;
 default:
 *error = BadValue;
-return False;
+return FALSE;
 }
 break;
 default:
 /* If an unknown attribute is received, fail.
  */
 *error = BadValue;
-return False;
+return FALSE;
 }
 }
 
@@ -414,7 +414,7 @@ dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned 
num_attribs,
  */
 if ((*flags & ~ALL_DRI_CTX_FLAGS) != 0) {
 *error = BadValue;
-return False;
+return FALSE;
 }
 
 /* If the core profile is requested for a GL version is less than 3.2,
@@ -428,7 +428,7 @@ dri2_convert_glx_attribs(__GLXDRIscreen *screen, unsigned 
num_attribs,
 }
 
 *error = Success;
-return True;
+return TRUE;
 }
 
 static void
diff --git a/glx/glxext.c b/glx/glxext.c
index e88bbd107..9b4d81641 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -97,7 +97,7 @@ ContextGone(__GLXcontext * cx, XID id)
 __glXFreeContext(cx);
 }
 
-return True;
+return TRUE;
 }
 
 static __GLXcontext *glxPendingDestroyContexts;
@@ -146,7 +146,7 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid)
 
 glxPriv->destroy(glxPriv);
 
-return True;
+return TRUE;
 }
 
 Bool
@@ -155,12 +155,12 @@ __glXAddContext(__GLXcontext * cx)
 /* Register this context as a resource.
  */
 if (!AddResource(cx->id, __glXContextRes, (void *)cx)) {
-   return False;
+   return FALSE;
 }
 
 cx->next = glxAllContexts;
 glxAllContexts = cx;
-return True;
+return TRUE;
 }
 
 static void
@@ -321,11 +321,11 @@ checkScreenVisuals(void)
 for (j = 0; j < screen->numVisuals; j++) {
 if (screen->visuals[j].class == TrueColor ||
 screen->visuals[j].class == DirectColor)
-return True;
+return TRUE;
 }
 }
 
-return False;
+return FALSE;
 }
 
 static void
@@ -355,7

Re: [PATCH xserver 3/3] glx: Remove some unused stuff from glxserver.h

Re: [PATCH xserver 1/3] glx: Remove True/False defines

Re: [PATCH xserver 1/3] glx: Remove True/False defines

[PATCH xserver 2/3] glx: Inline some reply swapping code

[PATCH xserver 3/3] glx: Remove some unused stuff from glxserver.h

[PATCH xserver 1/3] glx: Remove True/False defines

6 matches

Site Navigation

Mail list logo

Footer information