Merge branch 'master' into vulkan
This commit is contained in:
commit
17c835b245
|
@ -98,7 +98,7 @@ class TextureCache {
|
||||||
|
|
||||||
// "ActiveTexture" means as of the latest RequestTextures call.
|
// "ActiveTexture" means as of the latest RequestTextures call.
|
||||||
|
|
||||||
uint8_t GetActiveTextureHostSwizzle(uint32_t fetch_constant_index) const {
|
uint32_t GetActiveTextureHostSwizzle(uint32_t fetch_constant_index) const {
|
||||||
const TextureBinding* binding =
|
const TextureBinding* binding =
|
||||||
GetValidTextureBinding(fetch_constant_index);
|
GetValidTextureBinding(fetch_constant_index);
|
||||||
return binding ? binding->host_swizzle : xenos::XE_GPU_TEXTURE_SWIZZLE_0000;
|
return binding ? binding->host_swizzle : xenos::XE_GPU_TEXTURE_SWIZZLE_0000;
|
||||||
|
|
Loading…
Reference in New Issue