diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2010-02-22 19:15:52 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-02-22 19:37:09 +0100 |
| commit | 52d83efdbc4735d721e6fc9b44f29bdd432d4d73 (patch) | |
| tree | 76b3c5dc5f871aa523d4020e85428d9f6d50e460 | |
| parent | 1702db3a35e0be1934a78bea80bb0691eb0b773a (diff) | |
Revert "mesa/st: Make ST_SURFACE_DEPTH index consistent with mesa's BUFFER_DEPTH."
This reverts commit 9d17ad2891b58de9e33e943ff918a678c6a3c2bd.
Fun stuff so fixing exposes another bug which I'm having trouble
tracking down. So for now I'm just going to revert this untill
I can fix the real bug. Sorry about this.
| -rw-r--r-- | src/mesa/state_tracker/st_framebuffer.c | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_public.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_framebuffer.c b/src/mesa/state_tracker/st_framebuffer.c index 397fcd3ea7..26ee224b5d 100644 --- a/src/mesa/state_tracker/st_framebuffer.c +++ b/src/mesa/state_tracker/st_framebuffer.c @@ -175,7 +175,8 @@ st_set_framebuffer_surface(struct st_framebuffer *stfb, assert(ST_SURFACE_BACK_LEFT == BUFFER_BACK_LEFT); assert(ST_SURFACE_FRONT_RIGHT == BUFFER_FRONT_RIGHT); assert(ST_SURFACE_BACK_RIGHT == BUFFER_BACK_RIGHT); - assert(ST_SURFACE_DEPTH == BUFFER_DEPTH); + /* XXX The current values are wrong but fixing this causes new bugs*/ + /* assert(ST_SURFACE_DEPTH == BUFFER_DEPTH); */ assert(surfIndex < BUFFER_COUNT); diff --git a/src/mesa/state_tracker/st_public.h b/src/mesa/state_tracker/st_public.h index 1936ed64c4..f9ba252c02 100644 --- a/src/mesa/state_tracker/st_public.h +++ b/src/mesa/state_tracker/st_public.h @@ -39,7 +39,8 @@ #define ST_SURFACE_BACK_LEFT 1 #define ST_SURFACE_FRONT_RIGHT 2 #define ST_SURFACE_BACK_RIGHT 3 -#define ST_SURFACE_DEPTH 4 +/* XXX This value is wrong but fixing this causes other bugs */ +#define ST_SURFACE_DEPTH 8 #define ST_TEXTURE_2D 0x2 #define ST_TEXTURE_RECT 0x4 |