Merge pull request #242 from wheremyfoodat/nfc
Default TEV source 15 to the vertex colour
This commit is contained in:
@@ -345,7 +345,7 @@ void main() {
|
|||||||
if ((textureConfig & 2u) != 0u) tevSources[4] = texture(u_tex1, v_texcoord1);
|
if ((textureConfig & 2u) != 0u) tevSources[4] = texture(u_tex1, v_texcoord1);
|
||||||
if ((textureConfig & 4u) != 0u) tevSources[5] = texture(u_tex2, tex2UV);
|
if ((textureConfig & 4u) != 0u) tevSources[5] = texture(u_tex2, tex2UV);
|
||||||
tevSources[13] = vec4(0.0); // Previous buffer
|
tevSources[13] = vec4(0.0); // Previous buffer
|
||||||
tevSources[15] = vec4(0.0); // Previous combiner
|
tevSources[15] = v_colour; // Previous combiner
|
||||||
|
|
||||||
tevNextPreviousBuffer = v_textureEnvBufferColor;
|
tevNextPreviousBuffer = v_textureEnvBufferColor;
|
||||||
uint textureEnvUpdateBuffer = readPicaReg(0xE0);
|
uint textureEnvUpdateBuffer = readPicaReg(0xE0);
|
||||||
|
|||||||
Reference in New Issue
Block a user