Ivan Gyurdiev : wined3d: Improve Sampler support on 2.0 and 3.0 shaders.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jun 13 05:59:00 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 0d08316523590156b990dc48e6754ae0a74e1439
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=0d08316523590156b990dc48e6754ae0a74e1439

Author: Ivan Gyurdiev <ivg231 at gmail.com>
Date:   Mon Jun 12 02:59:16 2006 -0400

wined3d: Improve Sampler support on 2.0 and 3.0 shaders.

- track sampler declarations and store the sampler usage in reg_maps structure
- store a fake sampler usage for 1.X shaders (defined as 2D sampler)
- re-sync glsl TEX implementation with the ARB one (no idea why they diverged..)
- use sampler type in new TEX implementation to support 2D, 3D, and Cube sampling
- change drawprim to bind pixel shader samplers

Additional improvements:
- rename texture limit to texcoord to prevent confusion
- add sampler limit, and use that for samplers - *not* the same as texcoord above

---

 dlls/wined3d/baseshader.c      |   65 ++++++++++++++++++++++++++++++++--------
 dlls/wined3d/drawprim.c        |   33 ++++++++++++++++++++
 dlls/wined3d/glsl_shader.c     |   61 +++++++++++++++++++++++++-------------
 dlls/wined3d/pixelshader.c     |   23 +++++++++-----
 dlls/wined3d/vertexshader.c    |   10 ++++--
 dlls/wined3d/wined3d_private.h |    9 +++++-
 6 files changed, 155 insertions(+), 46 deletions(-)

Diff:   http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0d08316523590156b990dc48e6754ae0a74e1439



More information about the wine-cvs mailing list