Henri Verbeet : wined3d: Recognize geometry shaders in shader_trace_init().
Alexandre Julliard
julliard at winehq.org
Wed Jul 1 09:28:09 CDT 2009
Module: wine
Branch: master
Commit: ca69ec0e852a6f2e877f1c93d7a37d6f857bf9c7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca69ec0e852a6f2e877f1c93d7a37d6f857bf9c7
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jul 1 09:46:16 2009 +0200
wined3d: Recognize geometry shaders in shader_trace_init().
---
dlls/wined3d/baseshader.c | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index 45463f0..63a9e96 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
@@ -1138,14 +1138,34 @@ void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe_data,
{
struct wined3d_shader_version shader_version;
const DWORD* pToken = pFunction;
+ const char *type_prefix;
DWORD i;
TRACE("Parsing %p\n", pFunction);
fe->shader_read_header(fe_data, &pToken, &shader_version);
- TRACE("%s_%u_%u\n", shader_is_pshader_version(shader_version.type) ? "ps": "vs",
- shader_version.major, shader_version.minor);
+ switch (shader_version.type)
+ {
+ case WINED3D_SHADER_TYPE_VERTEX:
+ type_prefix = "vs";
+ break;
+
+ case WINED3D_SHADER_TYPE_GEOMETRY:
+ type_prefix = "gs";
+ break;
+
+ case WINED3D_SHADER_TYPE_PIXEL:
+ type_prefix = "ps";
+ break;
+
+ default:
+ FIXME("Unhandled shader type %#x.\n", shader_version.type);
+ type_prefix = "unknown";
+ break;
+ }
+
+ TRACE("%s_%u_%u\n", type_prefix, shader_version.major, shader_version.minor);
while (!fe->shader_is_end(fe_data, &pToken))
{
More information about the wine-cvs
mailing list