Merge branch 'master' into r300-compiler

diff --cc src/mesa/drivers/dri/r300/r300_fragprog_common.c
index 7f8a017459521bc70222f07cd1b4a018eb1251d9,0bdc90b4a84ead9cf9a5259c835cf33b0d2992d4..39618b78dc68c40734e174964b13842ce1127c14
--- 1/src/mesa/drivers/dri/r300/r300_fragprog_common.c
--- 2/src/mesa/drivers/dri/r300/r300_fragprog_common.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
@@@ -125,11 -131,11 +132,11 @@@ static void insert_WPOS_trailer(struct 
   */
  static void rewriteFog(struct r300_fragment_program_compiler *compiler, struct r300_fragment_program * fp)
  {
 -      struct prog_src_register src;
 +      struct rc_src_register src;
        int i;
  
+       fp->fog_attr = FRAG_ATTRIB_MAX;
        if (!(compiler->Base.Program.InputsRead & FRAG_BIT_FOGC)) {
-               fp->fog_attr = FRAG_ATTRIB_MAX;
                return;
        }
  
@@@ -141,8 -147,15 +148,15 @@@
                }
        }
  
+       /* No free texcoord found, fall-back to software rendering */
+       if (fp->fog_attr == FRAG_ATTRIB_MAX)
+       {
+               compiler->Base.Error = 1;
+               return;
+       }
+ 
        memset(&src, 0, sizeof(src));
 -      src.File = PROGRAM_INPUT;
 +      src.File = RC_FILE_INPUT;
        src.Index = fp->fog_attr;
        src.Swizzle = MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_ZERO, SWIZZLE_ZERO, SWIZZLE_ONE);
        rc_move_input(&compiler->Base, FRAG_ATTRIB_FOGC, src);

diff --cc src/mesa/drivers/dri/r300/r300_vertprog.c
index 8ad75fb5c0699ef8d16261235973e6fb9c0ed95e,2f7b67c14318524be510fe5ccc3fee22dcc2f700..fb8d6bceda828578603198e71ae7721f2ebf864b
--- 1/src/mesa/drivers/dri/r300/r300_vertprog.c
--- 2/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@@ -41,8 -41,9 +41,9 @@@ USE OR OTHER DEALINGS IN THE SOFTWARE
  #include "tnl/tnl.h"
  
  #include "compiler/radeon_compiler.h"
 -#include "compiler/radeon_nqssadce.h"
 +#include "radeon_mesa_to_rc.h"
  #include "r300_context.h"
+ #include "r300_fragprog_common.h"
  #include "r300_state.h"
  
  /**