diff options
| author | 2018-11-18 19:59:10 -0800 | |
|---|---|---|
| committer | 2018-11-18 19:59:10 -0800 | |
| commit | 6dc33fb812a668487c0652673977a63ada2632ee (patch) | |
| tree | d658210e06996f9b157b552d78f9b542d202d357 /src/video_core/textures | |
| parent | Merge pull request #1555 from ccawley2011/clang-format-docker (diff) | |
| parent | drop support for non separate alpha as it seems to cause issues in some games (diff) | |
| download | yuzu-6dc33fb812a668487c0652673977a63ada2632ee.tar.gz yuzu-6dc33fb812a668487c0652673977a63ada2632ee.tar.xz yuzu-6dc33fb812a668487c0652673977a63ada2632ee.zip | |
Merge pull request #1693 from Tinob/master
Missing ogl states
Diffstat (limited to 'src/video_core/textures')
| -rw-r--r-- | src/video_core/textures/texture.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/video_core/textures/texture.h b/src/video_core/textures/texture.h index e199d019a..ffa08f5c1 100644 --- a/src/video_core/textures/texture.h +++ b/src/video_core/textures/texture.h | |||
| @@ -190,6 +190,7 @@ struct TICEntry { | |||
| 190 | union { | 190 | union { |
| 191 | BitField<0, 4, u32> res_min_mip_level; | 191 | BitField<0, 4, u32> res_min_mip_level; |
| 192 | BitField<4, 4, u32> res_max_mip_level; | 192 | BitField<4, 4, u32> res_max_mip_level; |
| 193 | BitField<12, 12, u32> min_lod_clamp; | ||
| 193 | }; | 194 | }; |
| 194 | 195 | ||
| 195 | GPUVAddr Address() const { | 196 | GPUVAddr Address() const { |
| @@ -284,13 +285,25 @@ struct TSCEntry { | |||
| 284 | BitField<6, 3, WrapMode> wrap_p; | 285 | BitField<6, 3, WrapMode> wrap_p; |
| 285 | BitField<9, 1, u32> depth_compare_enabled; | 286 | BitField<9, 1, u32> depth_compare_enabled; |
| 286 | BitField<10, 3, DepthCompareFunc> depth_compare_func; | 287 | BitField<10, 3, DepthCompareFunc> depth_compare_func; |
| 288 | BitField<13, 1, u32> srgb_conversion; | ||
| 289 | BitField<20, 3, u32> max_anisotropy; | ||
| 287 | }; | 290 | }; |
| 288 | union { | 291 | union { |
| 289 | BitField<0, 2, TextureFilter> mag_filter; | 292 | BitField<0, 2, TextureFilter> mag_filter; |
| 290 | BitField<4, 2, TextureFilter> min_filter; | 293 | BitField<4, 2, TextureFilter> min_filter; |
| 291 | BitField<6, 2, TextureMipmapFilter> mip_filter; | 294 | BitField<6, 2, TextureMipmapFilter> mip_filter; |
| 295 | BitField<9, 1, u32> cubemap_interface_filtering; | ||
| 296 | BitField<12, 13, u32> mip_lod_bias; | ||
| 297 | }; | ||
| 298 | union { | ||
| 299 | BitField<0, 12, u32> min_lod_clamp; | ||
| 300 | BitField<12, 12, u32> max_lod_clamp; | ||
| 301 | BitField<24, 8, u32> srgb_border_color_r; | ||
| 302 | }; | ||
| 303 | union { | ||
| 304 | BitField<12, 8, u32> srgb_border_color_g; | ||
| 305 | BitField<20, 8, u32> srgb_border_color_b; | ||
| 292 | }; | 306 | }; |
| 293 | INSERT_PADDING_BYTES(8); | ||
| 294 | float border_color_r; | 307 | float border_color_r; |
| 295 | float border_color_g; | 308 | float border_color_g; |
| 296 | float border_color_b; | 309 | float border_color_b; |