Re: [Mesa-dev] [PATCH 1/2] i965: Rename __DRIScreen pointers to "dri_screen".

[Anuj Phogat]

On Tue, Sep 20, 2016 at 12:15 PM, Kenneth Graunke  wrote:
> I want to use "screen" as the variable name for a struct intel_screen
> pointer.  This means that we can't use it for __DRIscreen pointers.
>
> Sometimes we called it "screen", sometimes "sPriv", sometimes
> "driScrnPriv", and sometimes "psp" (Pointer to Screen Private?).
> The last one is particularly confusing because we use "psp" to refer to
> the Gen4 PIPELINED_STATE_POINTERS packet as well.
>
> Let's be consistent.  "dri_screen" is clear, and it's not used often
> enough that I'm worried about the verbosity.
>
> Signed-off-by: Kenneth Graunke 
> ---
>  src/mesa/drivers/dri/i965/brw_context.c   |  42 +-
>  src/mesa/drivers/dri/i965/intel_batchbuffer.c |   4 +-
>  src/mesa/drivers/dri/i965/intel_fbo.c |   7 +-
>  src/mesa/drivers/dri/i965/intel_screen.c  | 106 
> +-
>  src/mesa/drivers/dri/i965/intel_syncobj.c |   2 +-
>  src/mesa/drivers/dri/i965/intel_tex_image.c   |   7 +-
>  6 files changed, 85 insertions(+), 83 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_context.c 
> b/src/mesa/drivers/dri/i965/brw_context.c
> index 3af4555..27e7d59 100644
> --- a/src/mesa/drivers/dri/i965/brw_context.c
> +++ b/src/mesa/drivers/dri/i965/brw_context.c
> @@ -366,10 +366,10 @@ intel_flush_front(struct gl_context *ctx)
> struct brw_context *brw = brw_context(ctx);
> __DRIcontext *driContext = brw->driContext;
> __DRIdrawable *driDrawable = driContext->driDrawablePriv;
> -   __DRIscreen *const screen = brw->intelScreen->driScrnPriv;
> +   __DRIscreen *const dri_screen = brw->intelScreen->driScrnPriv;
>
> if (brw->front_buffer_dirty && _mesa_is_winsys_fbo(ctx->DrawBuffer)) {
> -  if (flushFront(screen) && driDrawable &&
> +  if (flushFront(dri_screen) && driDrawable &&
>driDrawable->loaderPrivate) {
>
>   /* Resolve before flushing FAKE_FRONT_LEFT to FRONT_LEFT.
> @@ -382,7 +382,7 @@ intel_flush_front(struct gl_context *ctx)
>   intel_resolve_for_dri2_flush(brw, driDrawable);
>   intel_batchbuffer_flush(brw);
>
> - flushFront(screen)(driDrawable, driDrawable->loaderPrivate);
> + flushFront(dri_screen)(driDrawable, driDrawable->loaderPrivate);
>
>   /* We set the dirty bit in intel_prepare_render() if we're
>* front buffer rendering once we get there.
> @@ -917,9 +917,8 @@ brwCreateContext(gl_api api,
>   unsigned *dri_ctx_error,
>  void *sharedContextPrivate)
>  {
> -   __DRIscreen *sPriv = driContextPriv->driScreenPriv;
> struct gl_context *shareCtx = (struct gl_context *) sharedContextPrivate;
> -   struct intel_screen *screen = sPriv->driverPrivate;
> +   struct intel_screen *screen = 
> driContextPriv->driScreenPriv->driverPrivate;
> const struct gen_device_info *devinfo = screen->devinfo;
> struct dd_function_table functions;
>
> @@ -1443,7 +1442,7 @@ void
>  intel_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
>  {
> struct brw_context *brw = context->driverPrivate;
> -   __DRIscreen *screen = brw->intelScreen->driScrnPriv;
> +   __DRIscreen *dri_screen = brw->intelScreen->driScrnPriv;
>
> /* Set this up front, so that in case our buffers get invalidated
>  * while we're getting new buffers, we don't clobber the stamp and
> @@ -1453,7 +1452,7 @@ intel_update_renderbuffers(__DRIcontext *context, 
> __DRIdrawable *drawable)
> if (unlikely(INTEL_DEBUG & DEBUG_DRI))
>fprintf(stderr, "enter %s, drawable %p\n", __func__, drawable);
>
> -   if (screen->image.loader)
> +   if (dri_screen->image.loader)
>intel_update_image_buffers(brw, drawable);
> else
>intel_update_dri2_buffers(brw, drawable);
> @@ -1517,7 +1516,7 @@ intel_query_dri2_buffers(struct brw_context *brw,
>   __DRIbuffer **buffers,
>   int *buffer_count)
>  {
> -   __DRIscreen *screen = brw->intelScreen->driScrnPriv;
> +   __DRIscreen *dri_screen = brw->intelScreen->driScrnPriv;
> struct gl_framebuffer *fb = drawable->driverPrivate;
> int i = 0;
> unsigned attachments[8];
> @@ -1561,12 +1560,13 @@ intel_query_dri2_buffers(struct brw_context *brw,
>
> assert(i <= ARRAY_SIZE(attachments));
>
> -   *buffers = screen->dri2.loader->getBuffersWithFormat(drawable,
> ->w,
> ->h,
> -attachments, i / 2,
> -buffer_count,
> -
> drawable->loaderPrivate);
> +   *buffers =
> +  dri_screen->dri2.loader->getBuffersWithFormat(drawable,
> +>w,
> +>h,
> +  

[Mesa-dev] [PATCH 1/2] i965: Rename __DRIScreen pointers to "dri_screen".

[Kenneth Graunke]

I want to use "screen" as the variable name for a struct intel_screen
pointer.  This means that we can't use it for __DRIscreen pointers.

Sometimes we called it "screen", sometimes "sPriv", sometimes
"driScrnPriv", and sometimes "psp" (Pointer to Screen Private?).
The last one is particularly confusing because we use "psp" to refer to
the Gen4 PIPELINED_STATE_POINTERS packet as well.

Let's be consistent.  "dri_screen" is clear, and it's not used often
enough that I'm worried about the verbosity.

Signed-off-by: Kenneth Graunke 
---
 src/mesa/drivers/dri/i965/brw_context.c   |  42 +-
 src/mesa/drivers/dri/i965/intel_batchbuffer.c |   4 +-
 src/mesa/drivers/dri/i965/intel_fbo.c |   7 +-
 src/mesa/drivers/dri/i965/intel_screen.c  | 106 +-
 src/mesa/drivers/dri/i965/intel_syncobj.c |   2 +-
 src/mesa/drivers/dri/i965/intel_tex_image.c   |   7 +-
 6 files changed, 85 insertions(+), 83 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_context.c 
b/src/mesa/drivers/dri/i965/brw_context.c
index 3af4555..27e7d59 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -366,10 +366,10 @@ intel_flush_front(struct gl_context *ctx)
struct brw_context *brw = brw_context(ctx);
__DRIcontext *driContext = brw->driContext;
__DRIdrawable *driDrawable = driContext->driDrawablePriv;
-   __DRIscreen *const screen = brw->intelScreen->driScrnPriv;
+   __DRIscreen *const dri_screen = brw->intelScreen->driScrnPriv;
 
if (brw->front_buffer_dirty && _mesa_is_winsys_fbo(ctx->DrawBuffer)) {
-  if (flushFront(screen) && driDrawable &&
+  if (flushFront(dri_screen) && driDrawable &&
   driDrawable->loaderPrivate) {
 
  /* Resolve before flushing FAKE_FRONT_LEFT to FRONT_LEFT.
@@ -382,7 +382,7 @@ intel_flush_front(struct gl_context *ctx)
  intel_resolve_for_dri2_flush(brw, driDrawable);
  intel_batchbuffer_flush(brw);
 
- flushFront(screen)(driDrawable, driDrawable->loaderPrivate);
+ flushFront(dri_screen)(driDrawable, driDrawable->loaderPrivate);
 
  /* We set the dirty bit in intel_prepare_render() if we're
   * front buffer rendering once we get there.
@@ -917,9 +917,8 @@ brwCreateContext(gl_api api,
  unsigned *dri_ctx_error,
 void *sharedContextPrivate)
 {
-   __DRIscreen *sPriv = driContextPriv->driScreenPriv;
struct gl_context *shareCtx = (struct gl_context *) sharedContextPrivate;
-   struct intel_screen *screen = sPriv->driverPrivate;
+   struct intel_screen *screen = driContextPriv->driScreenPriv->driverPrivate;
const struct gen_device_info *devinfo = screen->devinfo;
struct dd_function_table functions;
 
@@ -1443,7 +1442,7 @@ void
 intel_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
 {
struct brw_context *brw = context->driverPrivate;
-   __DRIscreen *screen = brw->intelScreen->driScrnPriv;
+   __DRIscreen *dri_screen = brw->intelScreen->driScrnPriv;
 
/* Set this up front, so that in case our buffers get invalidated
 * while we're getting new buffers, we don't clobber the stamp and
@@ -1453,7 +1452,7 @@ intel_update_renderbuffers(__DRIcontext *context, 
__DRIdrawable *drawable)
if (unlikely(INTEL_DEBUG & DEBUG_DRI))
   fprintf(stderr, "enter %s, drawable %p\n", __func__, drawable);
 
-   if (screen->image.loader)
+   if (dri_screen->image.loader)
   intel_update_image_buffers(brw, drawable);
else
   intel_update_dri2_buffers(brw, drawable);
@@ -1517,7 +1516,7 @@ intel_query_dri2_buffers(struct brw_context *brw,
  __DRIbuffer **buffers,
  int *buffer_count)
 {
-   __DRIscreen *screen = brw->intelScreen->driScrnPriv;
+   __DRIscreen *dri_screen = brw->intelScreen->driScrnPriv;
struct gl_framebuffer *fb = drawable->driverPrivate;
int i = 0;
unsigned attachments[8];
@@ -1561,12 +1560,13 @@ intel_query_dri2_buffers(struct brw_context *brw,
 
assert(i <= ARRAY_SIZE(attachments));
 
-   *buffers = screen->dri2.loader->getBuffersWithFormat(drawable,
->w,
->h,
-attachments, i / 2,
-buffer_count,
-
drawable->loaderPrivate);
+   *buffers =
+  dri_screen->dri2.loader->getBuffersWithFormat(drawable,
+>w,
+>h,
+attachments, i / 2,
+buffer_count,
+drawable->loaderPrivate);
 }
 
 /**
@@ -1713,7 +1713,7 @@ static void