← 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/r300/compiler/r300_fragprog_emit.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/r300/compiler/r300_fragprog_emit.c
95
95
        case RC_OPCODE_DP4: return R300_ALU_OUTC_DP4;
96
96
        case RC_OPCODE_FRC: return R300_ALU_OUTC_FRC;
97
97
        default:
98
 
                error("translate_rgb_opcode(%i): Unknown opcode", opcode);
 
98
                error("translate_rgb_opcode: Unknown opcode %s", rc_get_opcode_info(opcode)->Name);
99
99
                /* fall through */
100
100
        case RC_OPCODE_NOP:
101
101
                /* fall through */
116
116
        case RC_OPCODE_FRC: return R300_ALU_OUTA_FRC;
117
117
        case RC_OPCODE_LG2: return R300_ALU_OUTA_LG2;
118
118
        default:
119
 
                error("translate_rgb_opcode(%i): Unknown opcode", opcode);
 
119
                error("translate_rgb_opcode: Unknown opcode %s", rc_get_opcode_info(opcode)->Name);
120
120
                /* fall through */
121
121
        case RC_OPCODE_NOP:
122
122
                /* fall through */
135
135
{
136
136
        PROG_CODE;
137
137
 
138
 
        if (code->alu.length >= R300_PFS_MAX_ALU_INST) {
 
138
        if (code->alu.length >= c->Base.max_alu_insts) {
139
139
                error("Too many ALU instructions");
140
140
                return 0;
141
141
        }
302
302
        case RC_OPCODE_TXB: opcode = R300_TEX_OP_TXB; break;
303
303
        case RC_OPCODE_TXP: opcode = R300_TEX_OP_TXP; break;
304
304
        default:
305
 
                error("Unknown texture opcode %i", inst->U.I.Opcode);
 
305
                error("Unknown texture opcode %s", rc_get_opcode_info(inst->U.I.Opcode)->Name);
306
306
                return 0;
307
307
        }
308
308
 
328
328
 * Final compilation step: Turn the intermediate radeon_program into
329
329
 * machine-readable instructions.
330
330
 */
331
 
void r300BuildFragmentProgramHwCode(struct r300_fragment_program_compiler *compiler)
 
331
void r300BuildFragmentProgramHwCode(struct radeon_compiler *c, void *user)
332
332
{
 
333
        struct r300_fragment_program_compiler *compiler = (struct r300_fragment_program_compiler*)c;
333
334
        struct r300_emit_state emit;
334
335
        struct r300_fragment_program_code *code = &compiler->code->code.r300;
335
336
 
353
354
                }
354
355
        }
355
356
 
356
 
        if (code->pixsize >= R300_PFS_NUM_TEMP_REGS)
 
357
        if (code->pixsize >= compiler->Base.max_temp_regs)
357
358
                rc_error(&compiler->Base, "Too many hardware temporaries used.\n");
358
359
 
359
360
        if (compiler->Base.Error)