projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
ffb
/
ffb_clear.c
diff --git
a/src/mesa/drivers/dri/ffb/ffb_clear.c
b/src/mesa/drivers/dri/ffb/ffb_clear.c
index 776fb487f8d9df66d0951792ee3f13ad0b9b9573..aa3fa0a86c5961d894b81e858a117c1965a1e1e8 100644
(file)
--- a/
src/mesa/drivers/dri/ffb/ffb_clear.c
+++ b/
src/mesa/drivers/dri/ffb/ffb_clear.c
@@
-26,15
+26,12
@@
*/
#include "main/mtypes.h"
*/
#include "main/mtypes.h"
-#include "main/extensions.h"
#include "main/mm.h"
#include "ffb_dd.h"
#include "ffb_span.h"
#include "main/mm.h"
#include "ffb_dd.h"
#include "ffb_span.h"
-#include "ffb_depth.h"
#include "ffb_context.h"
#include "ffb_vb.h"
#include "ffb_context.h"
#include "ffb_vb.h"
-#include "ffb_tris.h"
#include "ffb_clear.h"
#include "ffb_lock.h"
#include "ffb_clear.h"
#include "ffb_lock.h"
@@
-123,7
+120,7
@@
CreatorComputePageFillFixups(struct ff_fixups *fixups,
}
static void
}
static void
-ffb_do_clear(GLcontext *ctx, __DRIdrawable
Private
*dPriv)
+ffb_do_clear(GLcontext *ctx, __DRIdrawable *dPriv)
{
ffbContextPtr fmesa = FFB_CONTEXT(ctx);
FFBDRIPtr gDRIPriv = (FFBDRIPtr) fmesa->driScreen->pDevPriv;
{
ffbContextPtr fmesa = FFB_CONTEXT(ctx);
FFBDRIPtr gDRIPriv = (FFBDRIPtr) fmesa->driScreen->pDevPriv;
@@
-252,7
+249,7
@@
ffb_do_clear(GLcontext *ctx, __DRIdrawablePrivate *dPriv)
void ffbDDClear(GLcontext *ctx, GLbitfield mask)
{
ffbContextPtr fmesa = FFB_CONTEXT(ctx);
void ffbDDClear(GLcontext *ctx, GLbitfield mask)
{
ffbContextPtr fmesa = FFB_CONTEXT(ctx);
- __DRIdrawable
Private
*dPriv = fmesa->driDrawable;
+ __DRIdrawable *dPriv = fmesa->driDrawable;
unsigned int stcmask = BUFFER_BIT_STENCIL;
#ifdef CLEAR_TRACE
unsigned int stcmask = BUFFER_BIT_STENCIL;
#ifdef CLEAR_TRACE