Mesa (master): nv50,nvc0: s/uint16/uint32 for constant buffer offset

Christoph Bumiller chrisbmr at kemper.freedesktop.org
Wed Jul 24 18:49:47 UTC 2013


Module: Mesa
Branch: master
Commit: 5c37039797938e43a7dfb6c7d39a1f0bb4f32df3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5c37039797938e43a7dfb6c7d39a1f0bb4f32df3

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Wed Jul 24 20:41:31 2013 +0200

nv50,nvc0: s/uint16/uint32 for constant buffer offset

Looks like a thinko, "Hey, constant buffers can be at most 64 KiB
in size, offset can't be larger." But it can, of course.

I think piglit lacks a test for UBO and BindBufferRange that
tests if it actually works.

---

 src/gallium/drivers/nv50/nv50_stateobj.h |    2 +-
 src/gallium/drivers/nvc0/nvc0_stateobj.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_stateobj.h b/src/gallium/drivers/nv50/nv50_stateobj.h
index f75608c..37b9967 100644
--- a/src/gallium/drivers/nv50/nv50_stateobj.h
+++ b/src/gallium/drivers/nv50/nv50_stateobj.h
@@ -40,7 +40,7 @@ struct nv50_constbuf {
       const uint8_t *data;
    } u;
    uint32_t size; /* max 65536 */
-   uint16_t offset;
+   uint32_t offset;
    boolean user; /* should only be TRUE if u.data is valid and non-NULL */
 };
 
diff --git a/src/gallium/drivers/nvc0/nvc0_stateobj.h b/src/gallium/drivers/nvc0/nvc0_stateobj.h
index edab60b..80c3342 100644
--- a/src/gallium/drivers/nvc0/nvc0_stateobj.h
+++ b/src/gallium/drivers/nvc0/nvc0_stateobj.h
@@ -38,7 +38,7 @@ struct nvc0_constbuf {
       const void *data;
    } u;
    uint32_t size;
-   uint16_t offset;
+   uint32_t offset;
    boolean user; /* should only be TRUE if u.data is valid and non-NULL */
 };
 




More information about the mesa-commit mailing list