diff options
| author | 2015-09-05 16:19:52 -0400 | |
|---|---|---|
| committer | 2015-09-05 16:19:52 -0400 | |
| commit | 51e91dfd8608126b2cb409fa2e8513f28fbf293b (patch) | |
| tree | f76ddff71ac10838e6429815d8267c82b602737f /src/video_core/pica.h | |
| parent | Merge pull request #1087 from yuriks/opengl-glad (diff) | |
| parent | OpenGL: Use Sampler Objects to decouple sampler config from textures (diff) | |
| download | yuzu-51e91dfd8608126b2cb409fa2e8513f28fbf293b.tar.gz yuzu-51e91dfd8608126b2cb409fa2e8513f28fbf293b.tar.xz yuzu-51e91dfd8608126b2cb409fa2e8513f28fbf293b.zip | |
Merge pull request #1104 from yuriks/opengl-samplers
OpenGL: Use Sampler Objects to decouple sampler config from textures
Diffstat (limited to 'src/video_core/pica.h')
| -rw-r--r-- | src/video_core/pica.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/video_core/pica.h b/src/video_core/pica.h index 855cb442e..c1dca5087 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h | |||
| @@ -135,6 +135,7 @@ struct Regs { | |||
| 135 | }; | 135 | }; |
| 136 | 136 | ||
| 137 | union { | 137 | union { |
| 138 | u32 raw; | ||
| 138 | BitField< 0, 8, u32> r; | 139 | BitField< 0, 8, u32> r; |
| 139 | BitField< 8, 8, u32> g; | 140 | BitField< 8, 8, u32> g; |
| 140 | BitField<16, 8, u32> b; | 141 | BitField<16, 8, u32> b; |
| @@ -339,6 +340,7 @@ struct Regs { | |||
| 339 | }; | 340 | }; |
| 340 | 341 | ||
| 341 | union { | 342 | union { |
| 343 | u32 const_color; | ||
| 342 | BitField< 0, 8, u32> const_r; | 344 | BitField< 0, 8, u32> const_r; |
| 343 | BitField< 8, 8, u32> const_g; | 345 | BitField< 8, 8, u32> const_g; |
| 344 | BitField<16, 8, u32> const_b; | 346 | BitField<16, 8, u32> const_b; |
| @@ -389,6 +391,7 @@ struct Regs { | |||
| 389 | TevStageConfig tev_stage5; | 391 | TevStageConfig tev_stage5; |
| 390 | 392 | ||
| 391 | union { | 393 | union { |
| 394 | u32 raw; | ||
| 392 | BitField< 0, 8, u32> r; | 395 | BitField< 0, 8, u32> r; |
| 393 | BitField< 8, 8, u32> g; | 396 | BitField< 8, 8, u32> g; |
| 394 | BitField<16, 8, u32> b; | 397 | BitField<16, 8, u32> b; |
| @@ -473,6 +476,7 @@ struct Regs { | |||
| 473 | }; | 476 | }; |
| 474 | 477 | ||
| 475 | union { | 478 | union { |
| 479 | u32 raw; | ||
| 476 | BitField< 0, 8, u32> r; | 480 | BitField< 0, 8, u32> r; |
| 477 | BitField< 8, 8, u32> g; | 481 | BitField< 8, 8, u32> g; |
| 478 | BitField<16, 8, u32> b; | 482 | BitField<16, 8, u32> b; |