projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Fix occlusion query on sandybridge
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i810
/
i810span.c
diff --git
a/src/mesa/drivers/dri/i810/i810span.c
b/src/mesa/drivers/dri/i810/i810span.c
index 2112800eebccd0ec81dcbc002869e4cdb5c50c72..dddab8bb51ed003b54208872879158ecb7cfbec8 100644
(file)
--- a/
src/mesa/drivers/dri/i810/i810span.c
+++ b/
src/mesa/drivers/dri/i810/i810span.c
@@
-1,21
+1,21
@@
-#include "glheader.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "colormac.h"
+#include "main/glheader.h"
+#include "main/macros.h"
+#include "main/mtypes.h"
+#include "main/colormac.h"
+#include "swrast/swrast.h"
#include "i810screen.h"
#include "i810_dri.h"
#include "i810span.h"
#include "i810ioctl.h"
#include "i810screen.h"
#include "i810_dri.h"
#include "i810span.h"
#include "i810ioctl.h"
-#include "swrast/swrast.h"
#define DBG 0
#define LOCAL_VARS \
i810ContextPtr imesa = I810_CONTEXT(ctx); \
#define DBG 0
#define LOCAL_VARS \
i810ContextPtr imesa = I810_CONTEXT(ctx); \
- __DRIdrawable
Private *dPriv = imesa->driDrawable;
\
+ __DRIdrawable
*dPriv = imesa->driDrawable;
\
driRenderbuffer *drb = (driRenderbuffer *) rb; \
GLuint pitch = drb->pitch; \
GLuint height = dPriv->h; \
driRenderbuffer *drb = (driRenderbuffer *) rb; \
GLuint pitch = drb->pitch; \
GLuint height = dPriv->h; \
@@
-27,7
+27,7
@@
#define LOCAL_DEPTH_VARS \
i810ContextPtr imesa = I810_CONTEXT(ctx); \
#define LOCAL_DEPTH_VARS \
i810ContextPtr imesa = I810_CONTEXT(ctx); \
- __DRIdrawable
Private *dPriv = imesa->driDrawable;
\
+ __DRIdrawable
*dPriv = imesa->driDrawable;
\
driRenderbuffer *drb = (driRenderbuffer *) rb; \
GLuint pitch = drb->pitch; \
GLuint height = dPriv->h; \
driRenderbuffer *drb = (driRenderbuffer *) rb; \
GLuint pitch = drb->pitch; \
GLuint height = dPriv->h; \
@@
-67,6
+67,8
@@
do { \
/* 16 bit depthbuffer functions.
*/
/* 16 bit depthbuffer functions.
*/
+#define VALUE_TYPE GLushort
+
#define WRITE_DEPTH( _x, _y, d ) \
*(GLushort *)(buf + (_x)*2 + (_y)*pitch) = d;
#define WRITE_DEPTH( _x, _y, d ) \
*(GLushort *)(buf + (_x)*2 + (_y)*pitch) = d;
@@
-79,7
+81,7
@@
do { \
/* Move locking out to get reasonable span performance.
*/
/* Move locking out to get reasonable span performance.
*/
-void i810SpanRenderStart(
GL
context *ctx )
+void i810SpanRenderStart(
struct gl_
context *ctx )
{
i810ContextPtr imesa = I810_CONTEXT(ctx);
I810_FIREVERTICES(imesa);
{
i810ContextPtr imesa = I810_CONTEXT(ctx);
I810_FIREVERTICES(imesa);
@@
-87,14
+89,14
@@
void i810SpanRenderStart( GLcontext *ctx )
i810RegetLockQuiescent( imesa );
}
i810RegetLockQuiescent( imesa );
}
-void i810SpanRenderFinish(
GL
context *ctx )
+void i810SpanRenderFinish(
struct gl_
context *ctx )
{
i810ContextPtr imesa = I810_CONTEXT( ctx );
_swrast_flush( ctx );
UNLOCK_HARDWARE( imesa );
}
{
i810ContextPtr imesa = I810_CONTEXT( ctx );
_swrast_flush( ctx );
UNLOCK_HARDWARE( imesa );
}
-void i810InitSpanFuncs(
GL
context *ctx )
+void i810InitSpanFuncs(
struct gl_
context *ctx )
{
struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference(ctx);
swdd->SpanRenderStart = i810SpanRenderStart;
{
struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference(ctx);
swdd->SpanRenderStart = i810SpanRenderStart;
@@
-107,7
+109,7
@@
void i810InitSpanFuncs( GLcontext *ctx )
* Plug in the Get/Put routines for the given driRenderbuffer.
*/
void
* Plug in the Get/Put routines for the given driRenderbuffer.
*/
void
-i810SetSpanFunctions(driRenderbuffer *drb, const
GLvisual
*vis)
+i810SetSpanFunctions(driRenderbuffer *drb, const
struct gl_config
*vis)
{
if (drb->Base.InternalFormat == GL_RGBA) {
/* always 565 RGB */
{
if (drb->Base.InternalFormat == GL_RGBA) {
/* always 565 RGB */