TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix multi-texture problem:

Browse Source 
If multi-texture was on before drawing with a shader, then the multi-texture would be in a bad state after drawing with the shader.
So, turn off multi-texture before shader usage.
This commit is contained in:
aignacio_sf 2007-02-10 01:28:50 +00:00
parent e8a0cd972d
commit 08d204b964
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/dxgsg9/dxShaderContext9.cxx
View File

@ -544,6 +544,9 @@ bind(GSG *gsg) {
// clear the last cached FVF to make sure the next SetFVF call goes through // clear the last cached FVF to make sure the next SetFVF call goes through
gsg -> _last_fvf = 0; gsg -> _last_fvf = 0;
// turn off fixed-function multi-texture
gsg -> set_texture_stage_state (0, D3DTSS_COLOROP, D3DTOP_DISABLE);
gsg -> set_texture_stage_state (1, D3DTSS_COLOROP, D3DTOP_DISABLE);
// Pass in k-parameters and transform-parameters // Pass in k-parameters and transform-parameters
issue_parameters(gsg, true); issue_parameters(gsg, true);
@ -1088,6 +1091,7 @@ update_shader_texture_bindings(CLP(ShaderContext) *prev, GSG *gsg)
continue; continue;
} }
TextureContext *tc = tex->prepare_now(gsg->_prepared_objects, gsg); TextureContext *tc = tex->prepare_now(gsg->_prepared_objects, gsg);
// TextureContext *tc = tex->prepare_now(gsg->get_prepared_objects(), gsg);
if (tc == (TextureContext*)NULL) { if (tc == (TextureContext*)NULL) {
continue; continue;
} }