diff options
Diffstat (limited to 'src/mesa/drivers/dri/radeon')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_maos_verts.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_tcl.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c index 985ad663c6d..31edfe067dc 100644 --- a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c +++ b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c @@ -35,6 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/glheader.h" #include "main/imports.h" #include "main/mtypes.h" +#include "main/state.h" #include "vbo/vbo.h" #include "math/m_translate.h" @@ -63,7 +64,7 @@ static struct { #define DO_RGBA (IND & RADEON_CP_VC_FRMT_PKCOLOR) #define DO_SPEC_OR_FOG (IND & RADEON_CP_VC_FRMT_PKSPEC) #define DO_SPEC ((IND & RADEON_CP_VC_FRMT_PKSPEC) && \ - (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)) + _mesa_need_secondary_color(ctx)) #define DO_FOG ((IND & RADEON_CP_VC_FRMT_PKSPEC) && ctx->Fog.Enabled && \ (ctx->Fog.FogCoordinateSource == GL_FOG_COORD)) #define DO_TEX0 (IND & RADEON_CP_VC_FRMT_ST0) diff --git a/src/mesa/drivers/dri/radeon/radeon_tcl.c b/src/mesa/drivers/dri/radeon/radeon_tcl.c index 7abc6c3c8dd..7832eaacd91 100644 --- a/src/mesa/drivers/dri/radeon/radeon_tcl.c +++ b/src/mesa/drivers/dri/radeon/radeon_tcl.c @@ -37,6 +37,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/mtypes.h" #include "main/light.h" #include "main/enums.h" +#include "main/state.h" #include "vbo/vbo.h" #include "tnl/tnl.h" @@ -376,7 +377,7 @@ static GLboolean radeon_run_tcl_render( struct gl_context *ctx, inputs |= VERT_BIT_NORMAL; } - if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) { + if (_mesa_need_secondary_color(ctx)) { inputs |= VERT_BIT_COLOR1; } |