Attachment 94934 Details for Bug 75543 – Patch to check buffer size when searching

[patch] Patch to check buffer size when searching

0001-st-osmesa-check-buffer-size-when-searching-for-buffe.patch (text/plain), 2.14 KB, created by Brian Paul on 2014-03-01 18:17:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2014-03-01 18:17:35 UTC

Size: 2.14 KB

patch

obsolete

>From 3cafb2cda8e4ac56eba7716027c977725b7d8f85 Mon Sep 17 00:00:00 2001
>From: Brian Paul <brianp@vmware.com>
>Date: Sat, 1 Mar 2014 11:16:27 -0700
>Subject: [PATCH] st/osmesa: check buffer size when searching for buffers
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75543
>Cc: "10.1" <mesa-stable@lists.freedesktop.org>
>---
> src/gallium/state_trackers/osmesa/osmesa.c |   11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/src/gallium/state_trackers/osmesa/osmesa.c b/src/gallium/state_trackers/osmesa/osmesa.c
>index 8b30025..6b27c8a 100644
>--- a/src/gallium/state_trackers/osmesa/osmesa.c
>+++ b/src/gallium/state_trackers/osmesa/osmesa.c
>@@ -480,12 +480,13 @@ osmesa_create_buffer(enum pipe_format color_format,
> 
> 
> /**
>- * Search linked list for a buffer with matching pixel formats.
>+ * Search linked list for a buffer with matching pixel formats and size.
>  */
> static struct osmesa_buffer *
> osmesa_find_buffer(enum pipe_format color_format,
>                    enum pipe_format ds_format,
>-                   enum pipe_format accum_format)
>+                   enum pipe_format accum_format,
>+                   GLsizei width, GLsizei height)
> {
>    struct osmesa_buffer *b;
> 
>@@ -493,7 +494,9 @@ osmesa_find_buffer(enum pipe_format color_format,
>    for (b = BufferList; b; b = b->next) {
>       if (b->visual.color_format == color_format &&
>           b->visual.depth_stencil_format == ds_format &&
>-          b->visual.accum_format == accum_format) {
>+          b->visual.accum_format == accum_format &&
>+          b->width == width &&
>+          b->height == height) {
>          return b;
>       }
>    }
>@@ -673,7 +676,7 @@ OSMesaMakeCurrent(OSMesaContext osmesa, void *buffer, GLenum type,
>    /* See if we already have a buffer that uses these pixel formats */
>    osbuffer = osmesa_find_buffer(color_format,
>                                  osmesa->depth_stencil_format,
>-                                 osmesa->accum_format);
>+                                 osmesa->accum_format, width, height);
>    if (!osbuffer) {
>       /* Existing buffer found, create new buffer */
>       osbuffer = osmesa_create_buffer(color_format,
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 75543: 94934

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.