Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VideoCommon: add additional texture sampler types to ShaderAsset #12139

Merged
merged 1 commit into from Sep 5, 2023

Conversation

iwubcode
Copy link
Contributor

@iwubcode iwubcode commented Aug 26, 2023

This adds a couple of additional sampler definitions to the ShaderAsset. This allows for distinguishing between a 2d sampler defined by assets and a 2d sampler that was defined by an alternate source (ex: Dolphin has a definition for an array of samplers in PixelShaderGen for instance). This distinction isn't super necessary at the moment but will be important later on if a user wants to add 2d textures with their own sampler information and independent resolution (needs #12136 )

I add two separate entries. One called Type_SamplerArrayShared_Main that denotes the main texture, in a sampler array this is where the sampler would come from and also sets the requirement for the size of the texture. Type_SamplerArrayShared_Additional is an additional texture which follows the sampler rules defined by Type_SamplerArrayShared_Main (which isn't a new concept, that's how texture sampler arrays work!)

@JMC47 JMC47 merged commit 9419d92 into dolphin-emu:master Sep 5, 2023
11 checks passed
@iwubcode iwubcode deleted the more_shader_texture_properties branch September 5, 2023 02:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants