Henri Verbeet : d3d10: Add a stub ID3D10Effect implementation.
Alexandre Julliard
julliard at winehq.org
Thu Feb 26 09:05:16 CST 2009
Module: wine
Branch: master
Commit: 737c64d2ce419fa43c111cf234c4d7e53a5f7aae
URL: http://source.winehq.org/git/wine.git/?a=commit;h=737c64d2ce419fa43c111cf234c4d7e53a5f7aae
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Feb 26 09:00:01 2009 +0100
d3d10: Add a stub ID3D10Effect implementation.
---
dlls/d3d10/Makefile.in | 1 +
dlls/d3d10/d3d10.spec | 2 +-
dlls/d3d10/d3d10_main.c | 25 ++++++
dlls/d3d10/d3d10_private.h | 8 ++
dlls/d3d10/effect.c | 190 ++++++++++++++++++++++++++++++++++++++++++++
include/d3d10effect.h | 11 +++
6 files changed, 236 insertions(+), 1 deletions(-)
diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in
index 3aef27d..f560b4e 100644
--- a/dlls/d3d10/Makefile.in
+++ b/dlls/d3d10/Makefile.in
@@ -8,6 +8,7 @@ IMPORTS = dxguid uuid d3d10core dxgi kernel32
C_SRCS = \
d3d10_main.c \
+ effect.c \
utils.c
RC_SRCS = version.rc
diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec
index 2613e38..0ea1d8f 100644
--- a/dlls/d3d10/d3d10.spec
+++ b/dlls/d3d10/d3d10.spec
@@ -3,7 +3,7 @@
@ stub D3D10CreateBlob
@ stdcall D3D10CreateDevice(ptr long ptr long long ptr)
@ stdcall D3D10CreateDeviceAndSwapChain(ptr long ptr long long ptr ptr ptr)
-@ stub D3D10CreateEffectFromMemory
+@ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr)
@ stub D3D10CreateEffectPoolFromMemory
@ stub D3D10CreateStateBlock
@ stub D3D10DisassembleEffect
diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c
index ad9651e..b13bb9f 100644
--- a/dlls/d3d10/d3d10_main.c
+++ b/dlls/d3d10/d3d10_main.c
@@ -204,3 +204,28 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER
return S_OK;
}
+
+HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags,
+ ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect)
+{
+ struct d3d10_effect *object;
+
+ FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n",
+ data, data_size, flags, device, effect_pool, effect);
+
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
+ if (!object)
+ {
+ ERR("Failed to allocate D3D10 effect object memory\n");
+ return E_OUTOFMEMORY;
+ }
+
+ object->vtbl = &d3d10_effect_vtbl;
+ object->refcount = 1;
+
+ *effect = (ID3D10Effect *)object;
+
+ TRACE("Created ID3D10Effect %p\n", object);
+
+ return S_OK;
+}
diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h
index 46a4576..c73c840 100644
--- a/dlls/d3d10/d3d10_private.h
+++ b/dlls/d3d10/d3d10_private.h
@@ -31,6 +31,14 @@
/* TRACE helper functions */
const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type);
+/* ID3D10Effect */
+extern const struct ID3D10EffectVtbl d3d10_effect_vtbl;
+struct d3d10_effect
+{
+ const struct ID3D10EffectVtbl *vtbl;
+ LONG refcount;
+};
+
/* D3D10Core */
HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter,
UINT flags, DWORD unknown0, ID3D10Device **device);
diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
new file mode 100644
index 0000000..54ae6ea
--- /dev/null
+++ b/dlls/d3d10/effect.c
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2009 Henri Verbeet for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ */
+
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3d10_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(d3d10);
+
+/* IUnknown methods */
+
+static HRESULT STDMETHODCALLTYPE d3d10_effect_QueryInterface(ID3D10Effect *iface, REFIID riid, void **object)
+{
+ TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object);
+
+ if (IsEqualGUID(riid, &IID_ID3D10Effect)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
+ IUnknown_AddRef(iface);
+ *object = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid));
+
+ *object = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d3d10_effect_AddRef(ID3D10Effect *iface)
+{
+ struct d3d10_effect *This = (struct d3d10_effect *)iface;
+ ULONG refcount = InterlockedIncrement(&This->refcount);
+
+ TRACE("%p increasing refcount to %u\n", This, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface)
+{
+ struct d3d10_effect *This = (struct d3d10_effect *)iface;
+ ULONG refcount = InterlockedDecrement(&This->refcount);
+
+ TRACE("%p decreasing refcount to %u\n", This, refcount);
+
+ if (!refcount)
+ {
+ HeapFree(GetProcessHeap(), 0, This);
+ }
+
+ return refcount;
+}
+
+/* ID3D10Effect methods */
+
+static BOOL STDMETHODCALLTYPE d3d10_effect_IsValid(ID3D10Effect *iface)
+{
+ FIXME("iface %p stub!\n", iface);
+
+ return FALSE;
+}
+
+static BOOL STDMETHODCALLTYPE d3d10_effect_IsPool(ID3D10Effect *iface)
+{
+ FIXME("iface %p stub!\n", iface);
+
+ return FALSE;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d10_effect_GetDevice(ID3D10Effect *iface, ID3D10Device **device)
+{
+ FIXME("iface %p, device %p stub!\n", iface, device);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d10_effect_GetDesc(ID3D10Effect *iface, D3D10_EFFECT_DESC *desc)
+{
+ FIXME("iface %p, desc %p stub!\n", iface, desc);
+
+ return E_NOTIMPL;
+}
+
+static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByIndex(ID3D10Effect *iface,
+ UINT index)
+{
+ FIXME("iface %p, index %u stub!\n", iface, index);
+
+ return NULL;
+}
+
+static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByName(ID3D10Effect *iface,
+ LPCSTR name)
+{
+ FIXME("iface %p, name \"%s\" stub!\n", iface, name);
+
+ return NULL;
+}
+
+static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByIndex(ID3D10Effect *iface, UINT index)
+{
+ FIXME("iface %p, index %u stub!\n", iface, index);
+
+ return NULL;
+}
+
+static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByName(ID3D10Effect *iface, LPCSTR name)
+{
+ FIXME("iface %p, name \"%s\" stub!\n", iface, name);
+
+ return NULL;
+}
+
+static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableBySemantic(ID3D10Effect *iface,
+ LPCSTR semantic)
+{
+ FIXME("iface %p, semantic \"%s\" stub!\n", iface, semantic);
+
+ return NULL;
+}
+
+static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByIndex(ID3D10Effect *iface,
+ UINT index)
+{
+ FIXME("iface %p, index %u stub!\n", iface, index);
+
+ return NULL;
+}
+
+static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByName(ID3D10Effect *iface,
+ LPCSTR name)
+{
+ FIXME("iface %p, name \"%s\" stub!\n", iface, name);
+
+ return NULL;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface)
+{
+ FIXME("iface %p stub!\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static BOOL STDMETHODCALLTYPE d3d10_effect_IsOptimized(ID3D10Effect *iface)
+{
+ FIXME("iface %p stub!\n", iface);
+
+ return FALSE;
+}
+
+const struct ID3D10EffectVtbl d3d10_effect_vtbl =
+{
+ /* IUnknown methods */
+ d3d10_effect_QueryInterface,
+ d3d10_effect_AddRef,
+ d3d10_effect_Release,
+ /* ID3D10Effect methods */
+ d3d10_effect_IsValid,
+ d3d10_effect_IsPool,
+ d3d10_effect_GetDevice,
+ d3d10_effect_GetDesc,
+ d3d10_effect_GetConstantBufferByIndex,
+ d3d10_effect_GetConstantBufferByName,
+ d3d10_effect_GetVariableByIndex,
+ d3d10_effect_GetVariableByName,
+ d3d10_effect_GetVariableBySemantic,
+ d3d10_effect_GetTechniqueByIndex,
+ d3d10_effect_GetTechniqueByName,
+ d3d10_effect_Optimize,
+ d3d10_effect_IsOptimized,
+};
diff --git a/include/d3d10effect.h b/include/d3d10effect.h
index 916f65a..ce409ea 100644
--- a/include/d3d10effect.h
+++ b/include/d3d10effect.h
@@ -241,4 +241,15 @@ DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown)
};
#undef INTERFACE
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags,
+ ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect);
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __WINE_D3D10EFFECT_H */
More information about the wine-cvs
mailing list