Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_ps_consts_i().
Alexandre Julliard
julliard at winehq.org
Thu Oct 3 16:44:00 CDT 2019
Module: wine
Branch: master
Commit: 638459bd5b42f41919d9c864196495b816b50df2
URL: https://source.winehq.org/git/wine.git/?a=commit;h=638459bd5b42f41919d9c864196495b816b50df2
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Oct 2 19:39:56 2019 -0500
wined3d: Introduce wined3d_stateblock_set_ps_consts_i().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/stateblock.c | 20 ++++++++++++++++++++
dlls/wined3d/wined3d.spec | 1 +
include/wine/wined3d.h | 2 ++
3 files changed, 23 insertions(+)
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 64a900fbde..0ff3199525 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -1366,6 +1366,26 @@ HRESULT CDECL wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stat
return WINED3D_OK;
}
+HRESULT CDECL wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock,
+ unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants)
+{
+ unsigned int i;
+
+ TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n",
+ stateblock, start_idx, count, constants);
+
+ if (!constants || start_idx >= WINED3D_MAX_CONSTS_I)
+ return WINED3DERR_INVALIDCALL;
+
+ if (count > WINED3D_MAX_CONSTS_I - start_idx)
+ count = WINED3D_MAX_CONSTS_I - start_idx;
+
+ memcpy(&stateblock->stateblock_state.ps_consts_i[start_idx], constants, count * sizeof(*constants));
+ for (i = start_idx; i < count + start_idx; ++i)
+ stateblock->changed.pixelShaderConstantsI |= (1u << i);
+ return WINED3D_OK;
+}
+
void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock,
struct wined3d_vertex_declaration *declaration)
{
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 016cf55c03..9772874c8b 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -260,6 +260,7 @@
@ cdecl wined3d_stateblock_incref(ptr)
@ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr)
@ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr)
+@ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr)
@ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr)
@ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr)
@ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index c4c469d4fe..215e50116c 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2663,6 +2663,8 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock);
void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);
HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock,
unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants);
+HRESULT __cdecl wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock,
+ unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants);
void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock,
struct wined3d_vertex_declaration *declaration);
void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);
More information about the wine-cvs
mailing list