diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-29 22:05:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-29 22:05:53 +0000 |
| commit | fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7 (patch) | |
| tree | fa1ba494685a71e28a096990a8707680c7cb378b /mesalib/src/mesa/swrast_setup | |
| parent | ae340911c1ba1f98b418bd8f1a487fa4d79491b0 (diff) | |
| parent | 6fda93be42ace9eeab0e82ceebb6798961c9105c (diff) | |
| download | vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.tar.gz vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.tar.bz2 vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/swrast_setup')
| -rw-r--r-- | mesalib/src/mesa/swrast_setup/ss_context.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/swrast_setup/ss_context.h | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/swrast_setup/ss_triangle.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/swrast_setup/ss_triangle.h | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/swrast_setup/ss_vb.h | 1 |
5 files changed, 4 insertions, 6 deletions
diff --git a/mesalib/src/mesa/swrast_setup/ss_context.c b/mesalib/src/mesa/swrast_setup/ss_context.c index ebd1574c4..0fcb7c77a 100644 --- a/mesalib/src/mesa/swrast_setup/ss_context.c +++ b/mesalib/src/mesa/swrast_setup/ss_context.c @@ -115,7 +115,7 @@ setup_vertex_format(GLcontext *ctx) GLboolean intColors = !ctx->FragmentProgram._Current && !ctx->ATIFragmentShader._Enabled && ctx->RenderMode == GL_RENDER - && CHAN_TYPE == GL_UNSIGNED_BYTE; + && CHAN_TYPE != GL_FLOAT; if (intColors != swsetup->intColors || !RENDERINPUTS_EQUAL(tnl->render_inputs_bitset, diff --git a/mesalib/src/mesa/swrast_setup/ss_context.h b/mesalib/src/mesa/swrast_setup/ss_context.h index 1ec293fad..56551ab27 100644 --- a/mesalib/src/mesa/swrast_setup/ss_context.h +++ b/mesalib/src/mesa/swrast_setup/ss_context.h @@ -28,9 +28,8 @@ #ifndef SS_CONTEXT_H #define SS_CONTEXT_H -#include "main/mtypes.h" +#include "main/glheader.h" #include "swrast/swrast.h" -#include "swrast_setup.h" #include "tnl/t_context.h" typedef struct { diff --git a/mesalib/src/mesa/swrast_setup/ss_triangle.c b/mesalib/src/mesa/swrast_setup/ss_triangle.c index bad0d8194..f22bc52f0 100644 --- a/mesalib/src/mesa/swrast_setup/ss_triangle.c +++ b/mesalib/src/mesa/swrast_setup/ss_triangle.c @@ -159,7 +159,7 @@ static void _swsetup_render_tri(GLcontext *ctx, } #define SS_COLOR(a,b) UNCLAMPED_FLOAT_TO_RGBA_CHAN(a,b) -#define SS_SPEC(a,b) UNCLAMPED_FLOAT_TO_RGB_CHAN(a,b) +#define SS_SPEC(a,b) COPY_4V(a,b) #define SS_IND(a,b) (a = b) #define IND (0) diff --git a/mesalib/src/mesa/swrast_setup/ss_triangle.h b/mesalib/src/mesa/swrast_setup/ss_triangle.h index 007fa2e91..ac553cbd0 100644 --- a/mesalib/src/mesa/swrast_setup/ss_triangle.h +++ b/mesalib/src/mesa/swrast_setup/ss_triangle.h @@ -29,7 +29,7 @@ #ifndef SS_TRIANGLE_H #define SS_TRIANGLE_H -#include "ss_context.h" +#include "main/mtypes.h" void _swsetup_trifuncs_init( GLcontext *ctx ); diff --git a/mesalib/src/mesa/swrast_setup/ss_vb.h b/mesalib/src/mesa/swrast_setup/ss_vb.h index 2ad1f56f3..944a3b78d 100644 --- a/mesalib/src/mesa/swrast_setup/ss_vb.h +++ b/mesalib/src/mesa/swrast_setup/ss_vb.h @@ -30,7 +30,6 @@ #define SS_VB_H #include "main/mtypes.h" -#include "swrast_setup.h" void _swsetup_vb_init( GLcontext *ctx ); void _swsetup_choose_rastersetup_func( GLcontext *ctx ); |