diff mbox

[1/4] dri3: Clean up struct dri3_drawable

Message ID 1385444155-15506-2-git-send-email-keithp@keithp.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Keith Packard Nov. 26, 2013, 5:35 a.m. UTC 
Move the depth field up with width and height.

Remove unused previous_time and frames fields.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/glx/dri3_priv.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

Kenneth Graunke Dec. 13, 2013, 11:01 p.m. UTC | #1 
On 11/25/2013 09:35 PM, Keith Packard wrote:
> Move the depth field up with width and height.
> 
> Remove unused previous_time and frames fields.
> 
> Signed-off-by: Keith Packard <keithp@keithp.com>
> ---
>  src/glx/dri3_priv.h | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h
> index 05f66cf..34c67a6 100644
> --- a/src/glx/dri3_priv.h
> +++ b/src/glx/dri3_priv.h
> @@ -177,7 +177,7 @@ dri3_pixmap_buf_id(enum dri3_buffer_type buffer_type)
>  struct dri3_drawable {
>     __GLXDRIdrawable base;
>     __DRIdrawable *driDrawable;
> -   int width, height;
> +   int width, height, depth;
>     int swap_interval;
>     uint8_t have_back;
>     uint8_t have_fake_front;
> @@ -193,13 +193,9 @@ struct dri3_drawable {
>     /* For WaitMSC */
>     uint32_t present_msc_request_serial;
>     uint32_t present_msc_event_serial;
> -   
> -   uint64_t previous_time;
> -   unsigned frames;
>  
>     struct dri3_buffer *buffers[DRI3_NUM_BUFFERS];
>     int cur_back;
> -   int depth;
>  
>     uint32_t *stamp;
>  
> 

This one is easy.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

I plan to push it - hopefully today.  I don't feel qualified to review
the SBC and swap event handling patches, so hopefully someone else can
take a look...
diff mbox

Patch

diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h
index 05f66cf..34c67a6 100644
--- a/src/glx/dri3_priv.h
+++ b/src/glx/dri3_priv.h
@@ -177,7 +177,7 @@  dri3_pixmap_buf_id(enum dri3_buffer_type buffer_type)
 struct dri3_drawable {
    __GLXDRIdrawable base;
    __DRIdrawable *driDrawable;
-   int width, height;
+   int width, height, depth;
    int swap_interval;
    uint8_t have_back;
    uint8_t have_fake_front;
@@ -193,13 +193,9 @@  struct dri3_drawable {
    /* For WaitMSC */
    uint32_t present_msc_request_serial;
    uint32_t present_msc_event_serial;
-   
-   uint64_t previous_time;
-   unsigned frames;
 
    struct dri3_buffer *buffers[DRI3_NUM_BUFFERS];
    int cur_back;
-   int depth;
 
    uint32_t *stamp;