H. Verbeet : wined3d:
Remove the sharing of mapping code for fixed function and pixel shader
samplers .
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jun 25 07:28:07 CDT 2007
Module: wine
Branch: master
Commit: 10ffa291e2751a1de75ebc0f389a83256f8b3d3f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ffa291e2751a1de75ebc0f389a83256f8b3d3f
Author: H. Verbeet <hverbeet at gmail.com>
Date: Fri Jun 22 20:43:38 2007 +0200
wined3d: Remove the sharing of mapping code for fixed function and pixel shader samplers.
---
dlls/wined3d/device.c | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index dc5343b..ff4bfcc 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3214,6 +3214,19 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) {
device_update_fixed_function_usage_map(This);
+ if (This->stateBlock->lowest_disabled_stage <= GL_LIMITS(textures)) {
+ for (i = 0; i < MAX_SAMPLERS; ++i) {
+ if (This->texUnitMap[i] != i) {
+ device_map_stage(This, i, i);
+ IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i));
+ if (i < MAX_TEXTURES) {
+ markTextureStagesDirty(This, i);
+ }
+ }
+ }
+ return;
+ }
+
/* No pixel shader, and we do not have enough texture units available. Try to skip NULL textures
* First, see if we can succeed at all
*/
@@ -3266,7 +3279,7 @@ void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) {
* -> Whith a 1:1 mapping oneToOneTexUnitMap is set to avoid checking MAX_SAMPLERS array
* entries to make pixel shaders cheaper. MAX_SAMPLERS will be 128 in dx10
*/
- if(This->stateBlock->pixelShader || This->stateBlock->lowest_disabled_stage <= GL_LIMITS(textures)) {
+ if (This->stateBlock->pixelShader) {
if(This->oneToOneTexUnitMap) {
TRACE("Not touching 1:1 map\n");
return;
More information about the wine-cvs
mailing list