diff options
Diffstat (limited to 'src/mesa/drivers/dri/sis/sis_context.h')
| -rw-r--r-- | src/mesa/drivers/dri/sis/sis_context.h | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_context.h b/src/mesa/drivers/dri/sis/sis_context.h index c4248e5420..fb4191a6ef 100644 --- a/src/mesa/drivers/dri/sis/sis_context.h +++ b/src/mesa/drivers/dri/sis/sis_context.h @@ -18,7 +18,7 @@ Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, +ERIC ANHOLT OR SILICON INTEGRATED SYSTEMS CORP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -37,6 +37,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "context.h" #include "dri_util.h" +#include "xmlconfig.h" #include "sis_screen.h" #include "sis_common2.h" @@ -198,8 +199,8 @@ typedef struct __GLSiSHardwareRec GLint hwTexEnvColor; /* Texture Blending Setting */ - GLint hwTexBlendClr0; - GLint hwTexBlendClr1; + GLint hwTexBlendColor0; + GLint hwTexBlendColor1; GLint hwTexBlendAlpha0; GLint hwTexBlendAlpha1; @@ -339,6 +340,7 @@ struct sis_context unsigned int backOffset; unsigned int backPitch; GLvoid *depthbuffer; + unsigned int depthOffset; unsigned int depthPitch; void *zbFree, *bbFree; /* Cookies for freeing buffers */ ENGPACKET zClearPacket, cbClearPacket; @@ -361,25 +363,16 @@ struct sis_context sisScreenPtr sisScreen; /* Screen private DRI data */ SISSAREAPrivPtr sarea; /* Private SAREA data */ + + /* Configuration cache */ + driOptionCache optionCache; }; #define SIS_CONTEXT(ctx) ((sisContextPtr)(ctx->DriverCtx)) /* Macros */ #define GET_IOBase(x) ((x)->IOBase) -#define GET_FbBase(x) ((x)->FbBase) -#define GET_AGPBase(x) ((x)->AGPBase) -#define GET_DEPTH(x) ((x)->bytesPerPixel) -#define GET_WIDTH(x) ((x)->displayWidth) -#define GET_FbPos(smesa,x,y) (GET_FbBase(smesa)+(x)*GET_DEPTH(smesa)\ - +(y)*smesa->frontPitch) - -#define GET_ColorFormat(x) ((x)->colorFormat) - -#define GET_RMASK(x) ((x)->redMask) -#define GET_GMASK(x) ((x)->greenMask) -#define GET_BMASK(x) ((x)->blueMask) -#define GET_AMASK(x) ((x)->alphaMask) + #define Y_FLIP(Y) (smesa->bottom - (Y)) #define SISPACKCOLOR565( r, g, b ) \ @@ -410,7 +403,7 @@ struct sis_context /* Update the mirrored queue pointer if it doesn't indicate enough space */ \ if (*(smesa->CurrentQueueLenPtr) < (wLen)) { \ *(smesa->CurrentQueueLenPtr) = \ - (*(GLint *)(GET_IOBase(smesa) + REG_QueueLen) & MASK_QueueLen) - 20; \ + (*(GLint *)(GET_IOBase(smesa) + REG_CommandQueue) & MASK_QueueLen) - 20; \ /* Spin and wait if the queue is actually too full */ \ if (*(smesa->CurrentQueueLenPtr) < (wLen)) \ WaitingFor3dIdle(smesa, wLen); \ |