(file) Return to r128_sarea.h CVS log (file) (dir) Up to [XFree86 CVS] / xc / programs / Xserver / hw / xfree86 / drivers / ati

Diff for /xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h between version 1.5 and 1.6

version 1.5, 2000/12/15 22:48:43 version 1.6, 2001/01/08 01:07:35
Line 1 
Line 1 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h,v 1.4 2000/12/04 19:21:53 dawes Exp $ */  /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h,v 1.5 2000/12/15 22:48:43 dawes Exp $ */
 /* /*
  * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,  * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
  *                      Precision Insight, Inc., Cedar Park, Texas, and  *                      Precision Insight, Inc., Cedar Park, Texas, and
Line 76 
Line 76 
  
 /* Vertex/indirect buffer size /* Vertex/indirect buffer size
  */  */
 #if 1  
 #define R128_BUFFER_SIZE                16384 #define R128_BUFFER_SIZE                16384
 #else  
 #define R128_BUFFER_SIZE                (128 * 1024)  
 #endif  
  
 /* Byte offsets for indirect buffer data /* Byte offsets for indirect buffer data
  */  */
Line 94 
Line 90 
 /* There are 2 heaps (local/AGP).  Each region within a heap is a /* There are 2 heaps (local/AGP).  Each region within a heap is a
  * minimum of 64k, and there are at most 64 of them per heap.  * minimum of 64k, and there are at most 64 of them per heap.
  */  */
 #define R128_LOCAL_TEX_HEAP             0  #define R128_CARD_HEAP                  0
 #define R128_AGP_TEX_HEAP               1  #define R128_AGP_HEAP                   1
 #define R128_NR_TEX_HEAPS               2 #define R128_NR_TEX_HEAPS               2
 #define R128_NR_TEX_REGIONS             64 #define R128_NR_TEX_REGIONS             64
 #define R128_LOG_TEX_GRANULARITY        16 #define R128_LOG_TEX_GRANULARITY        16
  
 #define R128_NR_CONTEXT_REGS            12 #define R128_NR_CONTEXT_REGS            12
 #define R128_TEX_MAXLEVELS              11  
   #define R128_MAX_TEXTURE_LEVELS         11
   #define R128_MAX_TEXTURE_UNITS          2
  
 #endif /* __R128_SAREA_DEFINES__ */ #endif /* __R128_SAREA_DEFINES__ */
  
Line 146 
Line 144 
     unsigned int tex_cntl;     unsigned int tex_cntl;
     unsigned int tex_combine_cntl;     unsigned int tex_combine_cntl;
     unsigned int tex_size_pitch;     unsigned int tex_size_pitch;
     unsigned int tex_offset[R128_TEX_MAXLEVELS];      unsigned int tex_offset[R128_MAX_TEXTURE_LEVELS];
     unsigned int tex_border_color;     unsigned int tex_border_color;
 } r128_texture_regs_t; } r128_texture_regs_t;
  
Line 161 
Line 159 
      * on firing a vertex buffer.      * on firing a vertex buffer.
      */      */
     r128_context_regs_t ContextState;     r128_context_regs_t ContextState;
     r128_texture_regs_t TexState[R128_NR_TEX_HEAPS];      r128_texture_regs_t TexState[R128_MAX_TEXTURE_UNITS];
     unsigned int        dirty;     unsigned int        dirty;
     unsigned int        vertsize;     unsigned int        vertsize;
     unsigned int        vc_format;     unsigned int        vc_format;


Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

Powered by
ViewCVS 0.9.2