projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/gallium-0.1' into gallium-0.2
[mesa.git]
/
src
/
mesa
/
drivers
/
glide
/
fxdd.c
diff --git
a/src/mesa/drivers/glide/fxdd.c
b/src/mesa/drivers/glide/fxdd.c
index f49c3889f6659033fa2ec07bbceb88ccb3ac5b5b..213ef2382feaad5db265bc964c147a20aaf9ef0a 100644
(file)
--- a/
src/mesa/drivers/glide/fxdd.c
+++ b/
src/mesa/drivers/glide/fxdd.c
@@
-40,15
+40,15
@@
#if defined(FX)
#if defined(FX)
-#include "image.h"
-#include "mtypes.h"
+#include "
main/
image.h"
+#include "m
ain/m
types.h"
#include "fxdrv.h"
#include "fxdrv.h"
-#include "buffers.h"
-#include "enums.h"
-#include "extensions.h"
-#include "macros.h"
-#include "texstore.h"
-#include "teximage.h"
+#include "
main/
buffers.h"
+#include "
main/
enums.h"
+#include "
main/
extensions.h"
+#include "ma
in/ma
cros.h"
+#include "
main/
texstore.h"
+#include "
main/
teximage.h"
#include "swrast/swrast.h"
#include "swrast/s_context.h"
#include "swrast_setup/swrast_setup.h"
#include "swrast/swrast.h"
#include "swrast/s_context.h"
#include "swrast_setup/swrast_setup.h"
@@
-1663,7
+1663,6
@@
static const struct tnl_pipeline_stage *fx_pipeline[] = {
&_tnl_texture_transform_stage,
&_tnl_point_attenuation_stage,
#if defined(FEATURE_NV_vertex_program) || defined(FEATURE_ARB_vertex_program)
&_tnl_texture_transform_stage,
&_tnl_point_attenuation_stage,
#if defined(FEATURE_NV_vertex_program) || defined(FEATURE_ARB_vertex_program)
- &_tnl_arb_vertex_program_stage,
&_tnl_vertex_program_stage,
#endif
&_tnl_render_stage,
&_tnl_vertex_program_stage,
#endif
&_tnl_render_stage,
@@
-1783,7
+1782,7
@@
fxDDInitFxMesaContext(fxMesaContext fxMesa)
/* Initialize the software rasterizer and helper modules.
*/
_swrast_CreateContext(ctx);
/* Initialize the software rasterizer and helper modules.
*/
_swrast_CreateContext(ctx);
- _
ac
_CreateContext(ctx);
+ _
vbo
_CreateContext(ctx);
_tnl_CreateContext(ctx);
_swsetup_CreateContext(ctx);
_tnl_CreateContext(ctx);
_swsetup_CreateContext(ctx);
@@
-1826,7
+1825,7
@@
fxDDDestroyFxMesaContext(fxMesaContext fxMesa)
{
_swsetup_DestroyContext(fxMesa->glCtx);
_tnl_DestroyContext(fxMesa->glCtx);
{
_swsetup_DestroyContext(fxMesa->glCtx);
_tnl_DestroyContext(fxMesa->glCtx);
- _
ac
_DestroyContext(fxMesa->glCtx);
+ _
vbo
_DestroyContext(fxMesa->glCtx);
_swrast_DestroyContext(fxMesa->glCtx);
if (fxMesa->state)
_swrast_DestroyContext(fxMesa->glCtx);
if (fxMesa->state)
@@
-1956,8
+1955,8
@@
fx_check_IsInHardware(GLcontext * ctx)
return FX_FALLBACK_STENCIL;
}
return FX_FALLBACK_STENCIL;
}
- if (
ctx->DrawBuffer->_ColorDrawBufferMask[0] != BUFFER_BIT_FRONT_LEFT
&&
-
ctx->DrawBuffer->_ColorDrawBufferMask[0] != BUFFER_BIT_BACK_LEFT
) {
+ if (
(ctx->DrawBuffer->_ColorDrawBufferIndexes[0] != BUFFER_BIT_FRONT_LEFT)
&&
+
(ctx->DrawBuffer->_ColorDrawBufferIndexes[0] != BUFFER_BIT_BACK_LEFT)
) {
return FX_FALLBACK_DRAW_BUFFER;
}
return FX_FALLBACK_DRAW_BUFFER;
}
@@
-2101,7
+2100,7
@@
fxDDUpdateDDPointers(GLcontext * ctx, GLuint new_state)
}
_swrast_InvalidateState(ctx, new_state);
}
_swrast_InvalidateState(ctx, new_state);
- _
ac
_InvalidateState(ctx, new_state);
+ _
vbo
_InvalidateState(ctx, new_state);
_tnl_InvalidateState(ctx, new_state);
_swsetup_InvalidateState(ctx, new_state);
_tnl_InvalidateState(ctx, new_state);
_swsetup_InvalidateState(ctx, new_state);