Module: Mesa Branch: mesa_7_7_branch Commit: 3889556d70283417fc912aa63dc99c1a59e4e2a4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3889556d70283417fc912aa63dc99c1a59e4e2a4
Author: Michel Dänzer <[email protected]> Date: Fri Mar 19 17:32:05 2010 +0100 Revert "Revert "mesa/st: Make ST_SURFACE_DEPTH index consistent with mesa's BUFFER_DEPTH."" This reverts commit 52d83efdbc4735d721e6fc9b44f29bdd432d4d73. The fix it reverted should be fine with the two previous fixes. --- src/mesa/state_tracker/st_framebuffer.c | 3 +-- src/mesa/state_tracker/st_public.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mesa/state_tracker/st_framebuffer.c b/src/mesa/state_tracker/st_framebuffer.c index 83d33c2..bcc4c28 100644 --- a/src/mesa/state_tracker/st_framebuffer.c +++ b/src/mesa/state_tracker/st_framebuffer.c @@ -173,8 +173,7 @@ 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); - /* XXX The current values are wrong but fixing this causes new bugs*/ - /* assert(ST_SURFACE_DEPTH == BUFFER_DEPTH); */ + 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 f9ba252..1936ed6 100644 --- a/src/mesa/state_tracker/st_public.h +++ b/src/mesa/state_tracker/st_public.h @@ -39,8 +39,7 @@ #define ST_SURFACE_BACK_LEFT 1 #define ST_SURFACE_FRONT_RIGHT 2 #define ST_SURFACE_BACK_RIGHT 3 -/* XXX This value is wrong but fixing this causes other bugs */ -#define ST_SURFACE_DEPTH 8 +#define ST_SURFACE_DEPTH 4 #define ST_TEXTURE_2D 0x2 #define ST_TEXTURE_RECT 0x4 _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
