[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    [PATCH v5 2/5] d3d10: Implement scalar effect variable get methods.
From:       Connor McAdams <conmanx360 () gmail ! com>
Date:       2020-02-28 18:51:45
Message-ID: 20200228185148.11383-2-conmanx360 () gmail ! com
[Download RAW message or body]

Implement GetFloat/GetFloatArray, GetInt/GetIntArray, and
GetBool/GetBoolArray methods for the scalar effect variable interface.

Signed-off-by: Connor McAdams <conmanx360@gmail.com>
---
 dlls/d3d10/effect.c | 84 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 72 insertions(+), 12 deletions(-)

diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index 42311bd1fe..182ba12004 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -4345,6 +4345,48 @@ static void write_variable_array_to_buffer(struct \
d3d10_effect_variable *variabl  variable->buffer->u.buffer.changed = TRUE;
 }
 
+static void read_variable_from_buffer(struct d3d10_effect_variable *variable, void \
*data, +        D3D_SHADER_VARIABLE_TYPE out_type)
+{
+    BYTE *buf = variable->buffer->u.buffer.local_buffer + variable->buffer_offset;
+
+    write_variable(data, out_type, buf, variable->type->basetype,
+            variable->type->column_count);
+}
+
+static void read_variable_array_from_buffer(struct d3d10_effect_variable *variable, \
void *data, +        D3D_SHADER_VARIABLE_TYPE out_type, unsigned int offset, unsigned \
int count) +{
+    BYTE *buf = variable->buffer->u.buffer.local_buffer + variable->buffer_offset;
+    BYTE *cur_element = data;
+    unsigned int element_size, i;
+
+    if (!variable->type->element_count)
+    {
+        read_variable_from_buffer(variable, data, out_type);
+        return;
+    }
+
+    if (offset >= variable->type->element_count)
+        return;
+
+    if (count > variable->type->element_count - offset)
+        count = variable->type->element_count - offset;
+
+    element_size = variable->type->elementtype->size_packed;
+    if (offset)
+        buf += variable->type->stride * offset;
+
+    for (i = 0; i < count; i++)
+    {
+        write_variable(cur_element, out_type, buf, variable->type->basetype,
+                variable->type->column_count);
+
+        cur_element += element_size;
+        buf += variable->type->stride;
+    }
+}
+
 /* ID3D10EffectVariable methods */
 
 static inline struct d3d10_effect_variable \
*impl_from_ID3D10EffectScalarVariable(ID3D10EffectScalarVariable *iface) @@ -4519,9 \
+4561,12 @@ static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_SetFloat(ID3D10Eff  static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_GetFloat(ID3D10EffectScalarVariable *iface,  float \
*value)  {
-    FIXME("iface %p, value %p stub!\n", iface, value);
+    struct d3d10_effect_variable *effect_var = \
impl_from_ID3D10EffectScalarVariable(iface);  
-    return E_NOTIMPL;
+    TRACE("iface %p, value %p.\n", iface, value);
+    read_variable_from_buffer(effect_var, value, D3D10_SVT_FLOAT);
+
+    return S_OK;
 }
 
 /*
@@ -4545,9 +4590,12 @@ static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_SetFloatArray(ID3D  static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_GetFloatArray(ID3D10EffectScalarVariable *iface,  float \
*values, UINT offset, UINT count)  {
-    FIXME("iface %p, values %p, offset %u, count %u stub!\n", iface, values, offset, \
count); +    struct d3d10_effect_variable *effect_var = \
impl_from_ID3D10EffectScalarVariable(iface);  
-    return E_NOTIMPL;
+    TRACE("iface %p, values %p, offset %u, count %u.\n", iface, values, offset, \
count); +    read_variable_array_from_buffer(effect_var, values, D3D10_SVT_FLOAT, 0, \
count); +
+    return S_OK;
 }
 
 static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_SetInt(ID3D10EffectScalarVariable *iface, @@ -4564,9 \
+4612,12 @@ static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_SetInt(ID3D10Effec  static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_GetInt(ID3D10EffectScalarVariable *iface,  int *value)
 {
-    FIXME("iface %p, value %p stub!\n", iface, value);
+    struct d3d10_effect_variable *effect_var = \
impl_from_ID3D10EffectScalarVariable(iface);  
-    return E_NOTIMPL;
+    TRACE("iface %p, value %p.\n", iface, value);
+    read_variable_from_buffer(effect_var, value, D3D10_SVT_INT);
+
+    return S_OK;
 }
 
 static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_SetIntArray(ID3D10EffectScalarVariable *iface, @@ \
-4583,9 +4634,12 @@ static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_SetIntArray(ID3D10  static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_GetIntArray(ID3D10EffectScalarVariable *iface,  int \
*values, UINT offset, UINT count)  {
-    FIXME("iface %p, values %p, offset %u, count %u stub!\n", iface, values, offset, \
count); +    struct d3d10_effect_variable *effect_var = \
impl_from_ID3D10EffectScalarVariable(iface);  
-    return E_NOTIMPL;
+    TRACE("iface %p, values %p, offset %u, count %u.\n", iface, values, offset, \
count); +    read_variable_array_from_buffer(effect_var, values, D3D10_SVT_INT, 0, \
count); +
+    return S_OK;
 }
 
 static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_SetBool(ID3D10EffectScalarVariable *iface, @@ -4602,9 \
+4656,12 @@ static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_SetBool(ID3D10Effe  static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_GetBool(ID3D10EffectScalarVariable *iface,  BOOL *value)
 {
-    FIXME("iface %p, value %p stub!\n", iface, value);
+    struct d3d10_effect_variable *effect_var = \
impl_from_ID3D10EffectScalarVariable(iface);  
-    return E_NOTIMPL;
+    TRACE("iface %p, value %p.\n", iface, value);
+    read_variable_from_buffer(effect_var, value, D3D10_SVT_BOOL);
+
+    return S_OK;
 }
 
 static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_SetBoolArray(ID3D10EffectScalarVariable *iface, @@ \
-4621,9 +4678,12 @@ static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_SetBoolArray(ID3D1  static HRESULT STDMETHODCALLTYPE \
d3d10_effect_scalar_variable_GetBoolArray(ID3D10EffectScalarVariable *iface,  BOOL \
*values, UINT offset, UINT count)  {
-    FIXME("iface %p, values %p, offset %u, count %u stub!\n", iface, values, offset, \
count); +    struct d3d10_effect_variable *effect_var = \
impl_from_ID3D10EffectScalarVariable(iface);  
-    return E_NOTIMPL;
+    TRACE("iface %p, values %p, offset %u, count %u.\n", iface, values, offset, \
count); +    read_variable_array_from_buffer(effect_var, values, D3D10_SVT_BOOL, 0, \
count); +
+    return S_OK;
 }
 
 static const struct ID3D10EffectScalarVariableVtbl d3d10_effect_scalar_variable_vtbl \
                =
-- 
2.20.1


[prev in list] [next in list] [prev in thread] [next in thread]