← Back to branch summary

~ubuntu-branches/ubuntu/natty/mesa/natty-proposed

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/i965/brw_wm_fp.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Hooker, Robert Hooker, Christopher James Halse Rogers
  • Date: 2010-09-14 08:55:40 UTC
  • mfrom: (1.2.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20100914085540-m4fpl0hdjlfd4jgz
Tags: 7.9~git20100909-0ubuntu1
https://launchpad.net/bugs/631413
https://launchpad.net/bugs/628930
https://launchpad.net/bugs/628727
https://launchpad.net/bugs/596292
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/630315
https://launchpad.net/bugs/613694
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/578619
https://launchpad.net/bugs/626943
https://launchpad.net/bugs/610541
https://launchpad.net/bugs/601052
[ Robert Hooker ]
* New upstream git snapshot up to commit 94118fe2d4b1e5 (LP: #631413)
* New features include ATI HD5xxx series support in r600, and a vastly
  improved glsl compiler.
* Remove pre-generated .pc's, use the ones generated at build time
  instead.
* Remove all references to mesa-utils now that its no longer shipped
  with the mesa source.
* Disable the experimental ARB_fragment_shader option by default on
  i915, it exposes incomplete functionality that breaks KDE compositing
  among other things. It can be enabled via driconf still. (LP: #628930).

[ Christopher James Halse Rogers ]
* debian/patches/04_osmesa_version.diff:
  - Refresh for new upstream
* Bugs fixed in this release:
  - Fixes severe rendering corruption in Unity on radeon (LP: #628727,
    LP: #596292, LP: #599741, LP: #630315, LP: #613694, LP: #599741).
  - Also fixes rendering in gnome-shell (LP: #578619).
  - Flickering in OpenGL apps on radeon (LP: #626943, LP: #610541).
  - Provides preliminary support for new intel chips (LP: #601052).
* debian/rules:
  - Update configure flags to match upstream reshuffling.
  - Explicitly remove gallium DRI drivers that we don't want to ship.
* Update debian/gbp.conf for this Maverick-specific packaging
* libegl1-mesa-dri-x11,kms: There are no longer separate kms or x11 drivers
  for EGL, libegl1-mesa-drivers now contains a single driver that provides
  both backends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/i965/brw_wm_fp.c
37
37
#include "brw_wm.h"
38
38
#include "brw_util.h"
39
39
 
40
 
#include "shader/prog_parameter.h"
41
 
#include "shader/prog_print.h"
42
 
#include "shader/prog_statevars.h"
 
40
#include "program/prog_parameter.h"
 
41
#include "program/prog_print.h"
 
42
#include "program/prog_statevars.h"
43
43
 
44
44
 
45
45
/** An invalid texture target */
88
88
   reg.RelAddr = 0;
89
89
   reg.Negate = NEGATE_NONE;
90
90
   reg.Abs = 0;
 
91
   reg.HasIndex2 = 0;
91
92
   return reg;
92
93
}
93
94
 
1036
1037
   for (i = 0; i < nr; i++, insn++) {
1037
1038
      printf("%3d: ", i);
1038
1039
      if (insn->Opcode < MAX_OPCODE)
1039
 
         _mesa_print_instruction(insn);
 
1040
         _mesa_fprint_instruction_opt(stdout, insn, 0, PROG_PRINT_DEBUG, NULL);
1040
1041
      else if (insn->Opcode < MAX_WM_OPCODE) {
1041
1042
         GLuint idx = insn->Opcode - MAX_OPCODE;
1042
1043
 
1043
 
         _mesa_print_alu_instruction(insn,
1044
 
                                     wm_opcode_strings[idx],
1045
 
                                     3);
 
1044
         _mesa_fprint_alu_instruction(stdout, insn, wm_opcode_strings[idx],
 
1045
                                      3, PROG_PRINT_DEBUG, NULL);
1046
1046
      }
1047
1047
      else 
1048
1048
         printf("965 Opcode %d\n", insn->Opcode);
1061
1061
 
1062
1062
   if (INTEL_DEBUG & DEBUG_WM) {
1063
1063
      printf("pre-fp:\n");
1064
 
      _mesa_print_program(&fp->program.Base); 
 
1064
      _mesa_fprint_program_opt(stdout, &fp->program.Base, PROG_PRINT_DEBUG,
 
1065
                               GL_TRUE);
1065
1066
      printf("\n");
1066
1067
   }
1067
1068