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

Fix multi-texture shader non-texture drawing problem.

Browse Source
This commit is contained in:
aignacio_sf 2007-02-23 21:32:01 +00:00
parent a4bbdb9901
commit d0ec0c2c43
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
View File

@ -2962,6 +2962,7 @@ do_issue_shader() {
_current_shader_context->unbind(this); _current_shader_context->unbind(this);
_current_shader_expansion = 0; _current_shader_expansion = 0;
_current_shader_context = 0; _current_shader_context = 0;
disable_standard_texture_bindings();
} }
return; return;
} }
@ -2973,6 +2974,7 @@ do_issue_shader() {
_current_shader_context->unbind(this); _current_shader_context->unbind(this);
_current_shader_context = 0; _current_shader_context = 0;
_current_shader_expansion = 0; _current_shader_expansion = 0;
disable_standard_texture_bindings();
} }
if (context != 0) { if (context != 0) {
context->bind(this); context->bind(this);
@ -3622,6 +3624,7 @@ disable_standard_texture_bindings() {
<< ", NULL) failed " << ", NULL) failed "
<< D3DERRORSTRING(hr); << D3DERRORSTRING(hr);
} }
set_texture_stage_state(i, D3DTSS_COLOROP, D3DTOP_DISABLE);
} }
_num_active_texture_stages = 0; _num_active_texture_stages = 0;

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

@ -544,9 +544,6 @@ 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);