Module: wine Branch: master Commit: 9cf78880022626080d6ee69a2ed4b7cd7e436d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf78880022626080d6ee69a2e...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Jul 9 09:56:11 2009 +0200
wined3d: Fix some cast-qual warnings.
---
dlls/wined3d/baseshader.c | 8 ++++---- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/glsl_shader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 3590d21..12fc28c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -750,7 +750,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 } reg_maps->loop_depth = max_loop_depth;
- This->baseShader.functionLength = ((char *)pToken - (char *)byte_code); + This->baseShader.functionLength = ((const char *)pToken - (const char *)byte_code);
return WINED3D_OK; } @@ -925,13 +925,13 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, switch (reg->immconst_type) { case WINED3D_IMMCONST_FLOAT: - TRACE("%.8e", *(float *)reg->immconst_data); + TRACE("%.8e", *(const float *)reg->immconst_data); break;
case WINED3D_IMMCONST_FLOAT4: TRACE("%.8e, %.8e, %.8e, %.8e", - *(float *)®->immconst_data[0], *(float *)®->immconst_data[1], - *(float *)®->immconst_data[2], *(float *)®->immconst_data[3]); + *(const float *)®->immconst_data[0], *(const float *)®->immconst_data[1], + *(const float *)®->immconst_data[2], *(const float *)®->immconst_data[3]); break;
default: diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bed6d84..bd5ddba 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -577,7 +577,7 @@ static ULONG STDMETHODCALLTYPE buffer_AddRef(IWineD3DBuffer *iface) }
/* Context activation is done by the caller. */ -const BYTE *buffer_get_sysmem(struct wined3d_buffer *This) +BYTE *buffer_get_sysmem(struct wined3d_buffer *This) { /* AllocatedMemory exists if the buffer is double buffered or has no buffer object at all */ if(This->resource.allocatedMemory) return This->resource.allocatedMemory; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 34266e9..82a5fb8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1335,13 +1335,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->immconst_type) { case WINED3D_IMMCONST_FLOAT: - sprintf(register_name, "%.8e", *(float *)reg->immconst_data); + sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); break;
case WINED3D_IMMCONST_FLOAT4: sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", - *(float *)®->immconst_data[0], *(float *)®->immconst_data[1], - *(float *)®->immconst_data[2], *(float *)®->immconst_data[3]); + *(const float *)®->immconst_data[0], *(const float *)®->immconst_data[1], + *(const float *)®->immconst_data[2], *(const float *)®->immconst_data[3]); break;
default: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 164e3bb..d8c56e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2395,7 +2395,7 @@ struct wined3d_buffer
extern const IWineD3DBufferVtbl wined3d_buffer_vtbl; const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer_object); -const BYTE *buffer_get_sysmem(struct wined3d_buffer *This); +BYTE *buffer_get_sysmem(struct wined3d_buffer *This);
/* IWineD3DRendertargetView */ struct wined3d_rendertarget_view