projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Don't emit register spill offsets directly into g0.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
unichrome
/
via_ioctl.c
diff --git
a/src/mesa/drivers/dri/unichrome/via_ioctl.c
b/src/mesa/drivers/dri/unichrome/via_ioctl.c
index 6746f552ae6d3335792d2813be12076ba2f56f71..116adda18ea2d74168acd2461a2199cefc3f89a7 100644
(file)
--- a/
src/mesa/drivers/dri/unichrome/via_ioctl.c
+++ b/
src/mesa/drivers/dri/unichrome/via_ioctl.c
@@
-34,7
+34,6
@@
#include "via_context.h"
#include "via_tris.h"
#include "via_ioctl.h"
#include "via_context.h"
#include "via_tris.h"
#include "via_ioctl.h"
-#include "via_state.h"
#include "via_fb.h"
#include "via_3d_reg.h"
#include "via_fb.h"
#include "via_3d_reg.h"
@@
-202,10
+201,10
@@
static void viaFillBuffer(struct via_context *vmesa,
-static void viaClear(
GL
context *ctx, GLbitfield mask)
+static void viaClear(
struct gl_
context *ctx, GLbitfield mask)
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
- __DRIdrawable
Private
*dPriv = vmesa->driDrawable;
+ __DRIdrawable *dPriv = vmesa->driDrawable;
struct via_renderbuffer *const vrb =
(struct via_renderbuffer *) dPriv->driverPrivate;
int flag = 0;
struct via_renderbuffer *const vrb =
(struct via_renderbuffer *) dPriv->driverPrivate;
int flag = 0;
@@
-507,12
+506,12
@@
void viaWaitIdleLocked( struct via_context *vmesa, GLboolean light )
* except that WAIT_IDLE() will spin the CPU polling, while this is
* IRQ driven.
*/
* except that WAIT_IDLE() will spin the CPU polling, while this is
* IRQ driven.
*/
-static void viaWaitIdleVBlank( __DRIdrawable
Private
*dPriv,
+static void viaWaitIdleVBlank( __DRIdrawable *dPriv,
struct via_context *vmesa,
GLuint value )
{
GLboolean missed_target;
struct via_context *vmesa,
GLuint value )
{
GLboolean missed_target;
- __DRIscreen
Private
*psp = dPriv->driScreenPriv;
+ __DRIscreen *psp = dPriv->driScreenPriv;
VIA_FLUSH_DMA(vmesa);
VIA_FLUSH_DMA(vmesa);
@@
-591,11
+590,11
@@
void viaResetPageFlippingLocked(struct via_context *vmesa)
/*
* Copy the back buffer to the front buffer.
*/
/*
* Copy the back buffer to the front buffer.
*/
-void viaCopyBuffer(__DRIdrawable
Private
*dPriv)
+void viaCopyBuffer(__DRIdrawable *dPriv)
{
struct via_context *vmesa =
(struct via_context *)dPriv->driContextPriv->driverPrivate;
{
struct via_context *vmesa =
(struct via_context *)dPriv->driContextPriv->driverPrivate;
- __DRIscreen
Private
*psp = dPriv->driScreenPriv;
+ __DRIscreen *psp = dPriv->driScreenPriv;
if (VIA_DEBUG & DEBUG_IOCTL)
fprintf(stderr,
if (VIA_DEBUG & DEBUG_IOCTL)
fprintf(stderr,
@@
-635,12
+634,12
@@
void viaCopyBuffer(__DRIdrawablePrivate *dPriv)
}
}
-void viaPageFlip(__DRIdrawable
Private
*dPriv)
+void viaPageFlip(__DRIdrawable *dPriv)
{
struct via_context *vmesa =
(struct via_context *)dPriv->driContextPriv->driverPrivate;
struct via_renderbuffer buffer_tmp;
{
struct via_context *vmesa =
(struct via_context *)dPriv->driContextPriv->driverPrivate;
struct via_renderbuffer buffer_tmp;
- __DRIscreen
Private
*psp = dPriv->driScreenPriv;
+ __DRIscreen *psp = dPriv->driScreenPriv;
VIA_FLUSH_DMA(vmesa);
if (dPriv->vblFlags == VBLANK_FLAG_SYNC &&
VIA_FLUSH_DMA(vmesa);
if (dPriv->vblFlags == VBLANK_FLAG_SYNC &&
@@
-758,6
+757,8
@@
static void via_emit_cliprect(struct via_context *vmesa,
vb[0] = HC_HEADER2;
vb[1] = (HC_ParaType_NotTex << 16);
vb[0] = HC_HEADER2;
vb[1] = (HC_ParaType_NotTex << 16);
+ assert(vmesa->driDrawable);
+
if (vmesa->driDrawable->w == 0 || vmesa->driDrawable->h == 0) {
vb[2] = (HC_SubA_HClipTB << 24) | 0x0;
vb[3] = (HC_SubA_HClipLR << 24) | 0x0;
if (vmesa->driDrawable->w == 0 || vmesa->driDrawable->h == 0) {
vb[2] = (HC_SubA_HClipTB << 24) | 0x0;
vb[3] = (HC_SubA_HClipLR << 24) | 0x0;
@@
-885,9
+886,6
@@
void viaFlushDmaLocked(struct via_context *vmesa, GLuint flags)
}
else if (vmesa->numClipRects) {
drm_clip_rect_t *pbox = vmesa->pClipRects;
}
else if (vmesa->numClipRects) {
drm_clip_rect_t *pbox = vmesa->pClipRects;
- __DRIdrawablePrivate *dPriv = vmesa->driDrawable;
- struct via_renderbuffer *const vrb =
- (struct via_renderbuffer *) dPriv->driverPrivate;
for (i = 0; i < vmesa->numClipRects; i++) {
drm_clip_rect_t b;
for (i = 0; i < vmesa->numClipRects; i++) {
drm_clip_rect_t b;
@@
-953,25
+951,25
@@
void viaFlushDma(struct via_context *vmesa)
}
}
}
}
-static void viaFlush(
GL
context *ctx)
+static void viaFlush(
struct gl_
context *ctx)
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
VIA_FLUSH_DMA(vmesa);
}
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
VIA_FLUSH_DMA(vmesa);
}
-static void viaFinish(
GL
context *ctx)
+static void viaFinish(
struct gl_
context *ctx)
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
VIA_FLUSH_DMA(vmesa);
viaWaitIdle(vmesa, GL_FALSE);
}
{
struct via_context *vmesa = VIA_CONTEXT(ctx);
VIA_FLUSH_DMA(vmesa);
viaWaitIdle(vmesa, GL_FALSE);
}
-static void viaClearStencil(
GL
context *ctx, int s)
+static void viaClearStencil(
struct gl_
context *ctx, int s)
{
return;
}
{
return;
}
-void viaInitIoctlFuncs(
GL
context *ctx)
+void viaInitIoctlFuncs(
struct gl_
context *ctx)
{
ctx->Driver.Flush = viaFlush;
ctx->Driver.Clear = viaClear;
{
ctx->Driver.Flush = viaFlush;
ctx->Driver.Clear = viaClear;