projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'llvm-cliptest-viewport'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r128
/
r128_span.c
diff --git
a/src/mesa/drivers/dri/r128/r128_span.c
b/src/mesa/drivers/dri/r128/r128_span.c
index 0413e5b4f12e11dd4bf743f2c515071600f21497..307de56ee13d3f7d55907cd0de672dc7bc509447 100644
(file)
--- a/
src/mesa/drivers/dri/r128/r128_span.c
+++ b/
src/mesa/drivers/dri/r128/r128_span.c
@@
-35,9
+35,7
@@
USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r128_context.h"
#include "r128_ioctl.h"
#include "r128_context.h"
#include "r128_ioctl.h"
-#include "r128_state.h"
#include "r128_span.h"
#include "r128_span.h"
-#include "r128_tex.h"
#include "swrast/swrast.h"
#include "swrast/swrast.h"
@@
-402,7
+400,7
@@
do { \
#include "stenciltmp.h"
static void
#include "stenciltmp.h"
static void
-r128SpanRenderStart(
GL
context *ctx )
+r128SpanRenderStart(
struct gl_
context *ctx )
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
FLUSH_BATCH(rmesa);
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
FLUSH_BATCH(rmesa);
@@
-411,7
+409,7
@@
r128SpanRenderStart( GLcontext *ctx )
}
static void
}
static void
-r128SpanRenderFinish(
GL
context *ctx )
+r128SpanRenderFinish(
struct gl_
context *ctx )
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
_swrast_flush( ctx );
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
_swrast_flush( ctx );
@@
-419,7
+417,7
@@
r128SpanRenderFinish( GLcontext *ctx )
UNLOCK_HARDWARE( rmesa );
}
UNLOCK_HARDWARE( rmesa );
}
-void r128DDInitSpanFuncs(
GL
context *ctx )
+void r128DDInitSpanFuncs(
struct gl_
context *ctx )
{
struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference(ctx);
swdd->SpanRenderStart = r128SpanRenderStart;
{
struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference(ctx);
swdd->SpanRenderStart = r128SpanRenderStart;
@@
-431,7
+429,7
@@
void r128DDInitSpanFuncs( GLcontext *ctx )
* Plug in the Get/Put routines for the given driRenderbuffer.
*/
void
* Plug in the Get/Put routines for the given driRenderbuffer.
*/
void
-r128SetSpanFunctions(driRenderbuffer *drb, const
GLvisual
*vis)
+r128SetSpanFunctions(driRenderbuffer *drb, const
struct gl_config
*vis)
{
if (drb->Base.Format == MESA_FORMAT_RGB565) {
r128InitPointers_RGB565(&drb->Base);
{
if (drb->Base.Format == MESA_FORMAT_RGB565) {
r128InitPointers_RGB565(&drb->Base);