Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/docs/GL3.txt

3 files changed, 19 insertions, 4 deletions

diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index d81ef5201..c3a2472cf 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -114,6 +114,19 @@ GL_ARB_vertex_attrib_64bit                           not started
 GL_ARB_viewport_array                                not started

 

 

+GL 4.2:

+GLSL 4.2                                             not started

+GL_ARB_texture_compression_bptc                      not started

+GL_ARB_compressed_texture_pixel_storage              not started

+GL_ARB_shader_atomic_counters                        not started

+GL_ARB_texture_storage                               not started

+GL_ARB_transform_feedback_instanced                  not started

+GL_ARB_base_instance                                 not started

+GL_ARB_shader_image_load_store                       not started

+GL_ARB_conservative_depth                            not started (may be close to AMD_conservative_depth though)

+GL_ARB_shading_language_420pack                      not started

+GL_ARB_internalformat_query                          not started

+GL_ARB_map_buffer_alignment                          not started

 

 

 More info about these features and the work involved can be found at

diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index d7a1ba80e..aef23e7d2 100644
--- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -1994,15 +1994,17 @@ glsl_to_tgsi_visitor::visit(ir_assignment *ir)
    } else if (ir->rhs->as_expression() &&
               this->instructions.get_tail() &&
               ir->rhs == ((glsl_to_tgsi_instruction *)this->instructions.get_tail())->ir &&
-              type_size(ir->lhs->type) == 1) {
+              type_size(ir->lhs->type) == 1 &&
+              l.writemask == ((glsl_to_tgsi_instruction *)this->instructions.get_tail())->dst.writemask) {
       /* To avoid emitting an extra MOV when assigning an expression to a 
        * variable, emit the last instruction of the expression again, but
        * replace the destination register with the target of the assignment.
        * Dead code elimination will remove the original instruction.
        */
-      glsl_to_tgsi_instruction *inst;
+      glsl_to_tgsi_instruction *inst, *new_inst;
       inst = (glsl_to_tgsi_instruction *)this->instructions.get_tail();
-      emit(ir, inst->op, l, inst->src[0], inst->src[1], inst->src[2]);
+      new_inst = emit(ir, inst->op, l, inst->src[0], inst->src[1], inst->src[2]);
+      new_inst->saturate = inst->saturate;
    } else {
       for (i = 0; i < type_size(ir->lhs->type); i++) {
          emit(ir, TGSI_OPCODE_MOV, l, r);
diff --git a/mesalib/src/mesa/swrast/s_span.c b/mesalib/src/mesa/swrast/s_span.c
index db102ac79..9a91be399 100644
--- a/mesalib/src/mesa/swrast/s_span.c
+++ b/mesalib/src/mesa/swrast/s_span.c
@@ -212,10 +212,10 @@ interpolate_active_attribs(struct gl_context *ctx, SWspan *span, GLbitfield attr
 static INLINE void
 interpolate_int_colors(struct gl_context *ctx, SWspan *span)
 {
+#if CHAN_BITS != 32
    const GLuint n = span->end;
    GLuint i;
 
-#if CHAN_BITS != 32
    ASSERT(!(span->arrayMask & SPAN_RGBA));
 #endif