[Mesa3d-dev] [PATCH] Make st_get_format_info aware of PIPE_FORMAT_Z24S8_UNORM

2009-12-29 Thread Luca Barbieri 
Fixes progs/demos/fbotexture on Nouveau.

diff --git a/src/mesa/state_tracker/st_format.c 
b/src/mesa/state_tracker/st_format.c
index 3e165c9..5f6f7d8 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -93,7 +93,7 @@ st_get_format_info(enum pipe_format format, struct 
pipe_format_info *pinfo)
   if (format == PIPE_FORMAT_A1R5G5B5_UNORM || format == 
PIPE_FORMAT_R5G6B5_UNORM) {
  pinfo-datatype = GL_UNSIGNED_SHORT;
   }
-  else if (format == PIPE_FORMAT_S8Z24_UNORM) {
+  else if (format == PIPE_FORMAT_S8Z24_UNORM || format == 
PIPE_FORMAT_Z24S8_UNORM) {
  pinfo-datatype = GL_UNSIGNED_INT_24_8;
   }
   else {



--
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev 
___
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev

Re: [Mesa3d-dev] [PATCH] Make st_get_format_info aware of PIPE_FORMAT_Z24S8_UNORM

2009-12-29 Thread Brian Paul 
Thanks.  Committed to the 7.7 branch.

-Brian


On Tue, Dec 29, 2009 at 10:41 PM, Luca Barbieri l...@luca-barbieri.com wrote:
 Fixes progs/demos/fbotexture on Nouveau.

 diff --git a/src/mesa/state_tracker/st_format.c 
 b/src/mesa/state_tracker/st_format.c
 index 3e165c9..5f6f7d8 100644
 --- a/src/mesa/state_tracker/st_format.c
 +++ b/src/mesa/state_tracker/st_format.c
 @@ -93,7 +93,7 @@ st_get_format_info(enum pipe_format format, struct 
 pipe_format_info *pinfo)
       if (format == PIPE_FORMAT_A1R5G5B5_UNORM || format == 
 PIPE_FORMAT_R5G6B5_UNORM) {
          pinfo-datatype = GL_UNSIGNED_SHORT;
       }
 -      else if (format == PIPE_FORMAT_S8Z24_UNORM) {
 +      else if (format == PIPE_FORMAT_S8Z24_UNORM || format == 
 PIPE_FORMAT_Z24S8_UNORM) {
          pinfo-datatype = GL_UNSIGNED_INT_24_8;
       }
       else {

--
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev 
___
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev