diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-09 11:16:20 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-09 11:16:20 -0700 |
| commit | e13593678f62941db06b7ae1a21b81c643371659 (patch) | |
| tree | 0d08b544c147ef08fa01a6c8fe3c9ae6efc78e7c /src/mesa/shader | |
| parent | 22c6c1eaad49692416f45bcbbcdc6424aea2da7c (diff) | |
re-add MSAA support
(cherry picked from commit f7d80aa00611917bc8ce637136d982b151b8f44f)
This also involved adding the new MSAA fields to driCreateConfigs().
Also, re-add prog_instructions->Sampler field for i965 driver. Will
have to revisit that.
Diffstat (limited to 'src/mesa/shader')
| -rw-r--r-- | src/mesa/shader/prog_instruction.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h index f978334ab2..c649b3db5e 100644 --- a/src/mesa/shader/prog_instruction.h +++ b/src/mesa/shader/prog_instruction.h @@ -418,7 +418,7 @@ struct prog_instruction */ GLint BranchTarget; -#if 0 +#if 01 /* XXX just use this for i965 driver for now! */ /** * For TEX instructions in shaders, the sampler to use for the * texture lookup. |