Skip to content

W
wine-cw
Commit 576cdea0 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

d3dcompiler: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 96b08eae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 98 deletions
dlls/d3dcompiler_33/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_33.dll
IMPORTS = dxguid uuid
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=33
EXTRADEFS = -DD3D_COMPILER_VERSION=33
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -Wb,--prefer-native
......
dlls/d3dcompiler_34/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_34.dll
IMPORTS = dxguid uuid
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=34
EXTRADEFS = -DD3D_COMPILER_VERSION=34
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -Wb,--prefer-native
......
dlls/d3dcompiler_35/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_35.dll
IMPORTS = dxguid uuid
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=35
EXTRADEFS = -DD3D_COMPILER_VERSION=35
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -Wb,--prefer-native
......
dlls/d3dcompiler_36/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_36.dll
IMPORTS = dxguid uuid
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=36
EXTRADEFS = -DD3D_COMPILER_VERSION=36
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -Wb,--prefer-native
......
dlls/d3dcompiler_37/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_37.dll
IMPORTS = dxguid uuid
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=37
EXTRADEFS = -DD3D_COMPILER_VERSION=37
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -Wb,--prefer-native
......
dlls/d3dcompiler_38/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_38.dll
IMPORTS = dxguid uuid
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=38
EXTRADEFS = -DD3D_COMPILER_VERSION=38
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -Wb,--prefer-native
......
dlls/d3dcompiler_39/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_39.dll
IMPORTS = dxguid uuid
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=39
EXTRADEFS = -DD3D_COMPILER_VERSION=39
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -Wb,--prefer-native
......
dlls/d3dcompiler_40/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_40.dll
IMPORTS = dxguid uuid
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=40
EXTRADEFS = -DD3D_COMPILER_VERSION=40
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -Wb,--prefer-native
......
dlls/d3dcompiler_41/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_41.dll
IMPORTS = dxguid uuid
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=41
EXTRADEFS = -DD3D_COMPILER_VERSION=41
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -Wb,--prefer-native
......
dlls/d3dcompiler_42/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_42.dll
IMPORTS = dxguid uuid
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=42
EXTRADEFS = -DD3D_COMPILER_VERSION=42
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -Wb,--prefer-native
......
dlls/d3dcompiler_43/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_43.dll
IMPORTLIB = d3dcompiler_43
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=43
EXTRADEFS = -DD3D_COMPILER_VERSION=43
EXTRADLLFLAGS = -Wb,--prefer-native
......
dlls/d3dcompiler_43/asmparser.c
View file @ 576cdea0
......@@ -73,8 +73,8 @@ static void asmparser_end(struct asm_parser *This) {
static void asmparser_constF(struct asm_parser *This, DWORD reg, float x, float y, float z, float w) {
if(!This->shader) return;
TRACE("Adding float constant %u at pos %u\n", reg, This->shader->num_cf);
TRACE_(parsed_shader)("def c%u, %f, %f, %f, %f\n", reg, x, y, z, w);
TRACE("Adding float constant %lu at pos %u.\n", reg, This->shader->num_cf);
TRACE_(parsed_shader)("def c%lu, %f, %f, %f, %f\n", reg, x, y, z, w);
if(!add_constF(This->shader, reg, x, y, z, w)) {
ERR("Out of memory\n");
set_parse_status(&This->status, PARSE_ERR);
......@@ -83,8 +83,8 @@ static void asmparser_constF(struct asm_parser *This, DWORD reg, float x, float
static void asmparser_constB(struct asm_parser *This, DWORD reg, BOOL x) {
if(!This->shader) return;
TRACE("Adding boolean constant %u at pos %u\n", reg, This->shader->num_cb);
TRACE_(parsed_shader)("def b%u, %s\n", reg, x ? "true" : "false");
TRACE("Adding boolean constant %lu at pos %u.\n", reg, This->shader->num_cb);
TRACE_(parsed_shader)("def b%lu, %s\n", reg, x ? "true" : "false");
if(!add_constB(This->shader, reg, x)) {
ERR("Out of memory\n");
set_parse_status(&This->status, PARSE_ERR);
......@@ -93,8 +93,8 @@ static void asmparser_constB(struct asm_parser *This, DWORD reg, BOOL x) {
static void asmparser_constI(struct asm_parser *This, DWORD reg, INT x, INT y, INT z, INT w) {
if(!This->shader) return;
TRACE("Adding integer constant %u at pos %u\n", reg, This->shader->num_ci);
TRACE_(parsed_shader)("def i%u, %d, %d, %d, %d\n", reg, x, y, z, w);
TRACE("Adding integer constant %lu at pos %u.\n", reg, This->shader->num_ci);
TRACE_(parsed_shader)("def i%lu, %d, %d, %d, %d\n", reg, x, y, z, w);
if(!add_constI(This->shader, reg, x, y, z, w)) {
ERR("Out of memory\n");
set_parse_status(&This->status, PARSE_ERR);
......@@ -240,7 +240,7 @@ static struct shader_reg map_oldps_register(const struct shader_reg *reg, BOOL t
case 6: ret.regnum = T6_VARYING; break;
case 7: ret.regnum = T7_VARYING; break;
default:
FIXME("Unexpected TEXTURE register t%u\n", reg->regnum);
FIXME("Unexpected TEXTURE register t%lu.\n", reg->regnum);
return *reg;
}
return ret;
......@@ -253,7 +253,7 @@ static struct shader_reg map_oldps_register(const struct shader_reg *reg, BOOL t
case 2: ret.regnum = T2_REG; break;
case 3: ret.regnum = T3_REG; break;
default:
FIXME("Unexpected TEXTURE register t%u\n", reg->regnum);
FIXME("Unexpected TEXTURE register t%lu.\n", reg->regnum);
return *reg;
}
return ret;
......@@ -620,7 +620,7 @@ static struct shader_reg map_oldvs_register(const struct shader_reg *reg) {
ret.u.writemask = OPTS_WRITEMASK;
break;
default:
FIXME("Unhandled RASTOUT register %u\n", reg->regnum);
FIXME("Unhandled RASTOUT register %lu.\n", reg->regnum);
return *reg;
}
return ret;
......@@ -638,7 +638,7 @@ static struct shader_reg map_oldvs_register(const struct shader_reg *reg) {
case 6: ret.regnum = OT6_REG; break;
case 7: ret.regnum = OT7_REG; break;
default:
FIXME("Unhandled TEXCRDOUT regnum %u\n", reg->regnum);
FIXME("Unhandled TEXCRDOUT regnum %lu.\n", reg->regnum);
return *reg;
}
return ret;
......@@ -650,7 +650,7 @@ static struct shader_reg map_oldvs_register(const struct shader_reg *reg) {
case 0: ret.regnum = OD0_REG; break;
case 1: ret.regnum = OD1_REG; break;
default:
FIXME("Unhandled ATTROUT regnum %u\n", reg->regnum);
FIXME("Unhandled ATTROUT regnum %lu.\n", reg->regnum);
return *reg;
}
return ret;
......
dlls/d3dcompiler_43/asmshader.y
View file @ 576cdea0
......@@ -1108,7 +1108,7 @@ writemask: '.' wm_components
}
else {
$$ = $2.writemask;
TRACE("Writemask: %x\n", $$);
TRACE("Writemask: %lx\n", $$);
}
}
......@@ -1136,7 +1136,7 @@ wm_components: COMPONENT
swizzle: /* empty */
{
$$ = BWRITERVS_NOSWIZZLE;
TRACE("Default swizzle: %08x\n", $$);
TRACE("Default swizzle: %08lx\n", $$);
}
| '.' sw_components
{
......@@ -1156,7 +1156,7 @@ swizzle: /* empty */
for(i = $2.idx; i < 4; i++){
$$ |= last << (2 * i);
}
TRACE("Got a swizzle: %08x\n", $$);
TRACE("Got a swizzle: %08lx\n", $$);
}
}
......@@ -1303,7 +1303,7 @@ sreg: sreg_name rel_reg swizzle
set_parse_status(&asm_ctx.status, PARSE_ERR);
break;
default:
FIXME("Unhandled combination of NEGATE and %u\n", $4);
FIXME("Unhandled combination of NEGATE and %lu\n", $4);
}
$$.u.swizzle = $5;
}
......
dlls/d3dcompiler_43/blob.c
View file @ 576cdea0
......@@ -62,7 +62,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_AddRef(ID3DBlob *iface)
struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface);
ULONG refcount = InterlockedIncrement(&blob->refcount);
TRACE("%p increasing refcount to %u\n", blob, refcount);
TRACE("%p increasing refcount to %lu.\n", blob, refcount);
return refcount;
}
......@@ -72,7 +72,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_Release(ID3DBlob *iface)
struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface);
ULONG refcount = InterlockedDecrement(&blob->refcount);
TRACE("%p decreasing refcount to %u\n", blob, refcount);
TRACE("%p decreasing refcount to %lu.\n", blob, refcount);
if (!refcount)
{
......@@ -135,7 +135,7 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob)
struct d3dcompiler_blob *object;
HRESULT hr;
TRACE("data_size %lu, blob %p\n", data_size, blob);
TRACE("data_size %Iu, blob %p.\n", data_size, blob);
if (!blob)
{
......@@ -150,7 +150,7 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob)
hr = d3dcompiler_blob_init(object, data_size);
if (FAILED(hr))
{
WARN("Failed to initialize blob, hr %#x.\n", hr);
WARN("Failed to initialize blob, hr %#lx.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
return hr;
}
......@@ -222,7 +222,7 @@ static HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D
if (!data || !data_size || flags || !blob)
{
WARN("Invalid arguments: data %p, data_size %lu, flags %#x, blob %p\n", data, data_size, flags, blob);
WARN("Invalid arguments: data %p, data_size %Iu, flags %#x, blob %p.\n", data, data_size, flags, blob);
return D3DERR_INVALIDCALL;
}
......@@ -369,7 +369,7 @@ static HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT
if (!data || !data_size)
{
WARN("Invalid arguments: data %p, data_size %lu\n", data, data_size);
WARN("Invalid arguments: data %p, data_size %Iu.\n", data, data_size);
return D3DERR_INVALIDCALL;
}
......@@ -420,7 +420,7 @@ static HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT
HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob)
{
TRACE("data %p, data_size %lu, part %s, flags %#x, blob %p\n", data,
TRACE("data %p, data_size %Iu, part %s, flags %#x, blob %p.\n", data,
data_size, debug_d3dcompiler_d3d_blob_part(part), flags, blob);
return d3dcompiler_get_blob_part(data, data_size, part, flags, blob);
......@@ -428,35 +428,35 @@ HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART
HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob)
{
TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob);
TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob);
return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, blob);
}
HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob)
{
TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob);
TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob);
return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, blob);
}
HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob)
{
TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob);
TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob);
return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, blob);
}
HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob)
{
TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob);
TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob);
return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_DEBUG_INFO, 0, blob);
}
HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID3D10Blob **blob)
{
TRACE("data %p, data_size %lu, flags %#x, blob %p\n", data, data_size, flags, blob);
TRACE("data %p, data_size %Iu, flags %#x, blob %p.\n", data, data_size, flags, blob);
return d3dcompiler_strip_shader(data, data_size, flags, blob);
}
......@@ -490,7 +490,7 @@ HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents)
if (FAILED(hr = d3dcompiler_blob_init(object, data_size)))
{
WARN("Failed to initialize blob, hr %#x.\n", hr);
WARN("Failed to initialise blob, hr %#lx.\n", hr);
CloseHandle(file);
heap_free(object);
return hr;
......
dlls/d3dcompiler_43/compiler.c
View file @ 576cdea0
......@@ -689,7 +689,7 @@ static HRESULT assemble_shader(const char *preproc_shader,
SlDeleteShader(shader);
if (FAILED(hr))
{
ERR("Failed to write bytecode, hr %#x.\n", hr);
ERR("Failed to write bytecode, hr %#lx.\n", hr);
return D3DXERR_INVALIDDATA;
}
......@@ -716,7 +716,7 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena
{
HRESULT hr;
TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, sflags %#x, "
TRACE("data %p, datasize %Iu, filename %s, defines %p, include %p, sflags %#x, "
"shader %p, error_messages %p.\n",
data, datasize, debugstr_a(filename), defines, include, flags, shader, error_messages);
......@@ -745,9 +745,9 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen
{
HRESULT hr;
TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, "
TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, entrypoint %s, "
"target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p, "
"secondary_data_size %lu, shader %p, error_messages %p.\n",
"secondary_data_size %Iu, shader %p, error_messages %p.\n",
data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint),
debugstr_a(target), sflags, eflags, secondary_flags, secondary_data,
secondary_data_size, shader, error_messages);
......@@ -776,7 +776,7 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena
const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint,
const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages)
{
TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, "
TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, entrypoint %s, "
"target %s, sflags %#x, eflags %#x, shader %p, error_messages %p.\n",
data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint),
debugstr_a(target), sflags, eflags, shader, error_messages);
......@@ -792,7 +792,7 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename
HRESULT hr;
ID3DBlob *buffer;
TRACE("data %p, size %lu, filename %s, defines %p, include %p, shader %p, error_messages %p\n",
TRACE("data %p, size %Iu, filename %s, defines %p, include %p, shader %p, error_messages %p.\n",
data, size, debugstr_a(filename), defines, include, shader, error_messages);
if (!data)
......@@ -827,7 +827,7 @@ cleanup:
HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const char *comments, ID3DBlob **disassembly)
{
FIXME("data %p, size %lu, flags %#x, comments %p, disassembly %p stub!\n",
FIXME("data %p, size %Iu, flags %#x, comments %p, disassembly %p stub!\n",
data, size, flags, comments, disassembly);
return E_NOTIMPL;
}
......@@ -881,6 +881,6 @@ end:
HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module)
{
FIXME("data %p, size %lu, module %p stub!\n", data, size, module);
FIXME("data %p, size %Iu, module %p stub!\n", data, size, module);
return E_NOTIMPL;
}
dlls/d3dcompiler_43/reflection.c
View file @ 576cdea0
......@@ -18,9 +18,6 @@
*
*/
#ifndef WINE_NO_LONG_TYPES
#define WINE_NO_LONG_TYPES
#endif
#include "initguid.h"
#include "d3dcompiler_private.h"
#include "d3d10.h"
......@@ -365,7 +362,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_AddRef(ID3D11Shader
struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u\n", This, refcount);
TRACE("%p increasing refcount to %lu.\n", This, refcount);
return refcount;
}
......@@ -375,7 +372,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade
struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface);
ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u\n", This, refcount);
TRACE("%p decreasing refcount to %lu.\n", This, refcount);
if (!refcount)
{
......@@ -1095,7 +1092,7 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c
const char *ptr = data;
DWORD size = data_size >> 2;
TRACE("Size %u\n", size);
TRACE("Size %lu\n", size);
r->instruction_count = read_dword(&ptr);
TRACE("InstructionCount: %u\n", r->instruction_count);
......@@ -1202,7 +1199,7 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c
/* dx11 stat size */
if (size == 37) return S_OK;
FIXME("Unhandled size %u\n", size);
FIXME("Unhandled size %lu.\n", size);
return E_FAIL;
}
......@@ -1221,7 +1218,7 @@ static HRESULT d3dcompiler_parse_type_members(struct d3dcompiler_shader_reflecti
TRACE("Member name: %s.\n", debugstr_a(member->name));
offset = read_dword(ptr);
TRACE("Member type offset: %x\n", offset);
TRACE("Member type offset: %#lx\n", offset);
member->type = get_reflection_type(ref, data, offset);
if (!member->type)
......@@ -1232,7 +1229,7 @@ static HRESULT d3dcompiler_parse_type_members(struct d3dcompiler_shader_reflecti
}
member->offset = read_dword(ptr);
TRACE("Member offset %x\n", member->offset);
TRACE("Member offset %#lx\n", member->offset);
return S_OK;
}
......@@ -1266,7 +1263,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type
TRACE("Elements %u, Members %u\n", desc->Elements, desc->Members);
member_offset = read_dword(&ptr);
TRACE("Member Offset %u\n", member_offset);
TRACE("Member Offset %lu\n", member_offset);
if ((type->reflection->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500)
skip_dword_unknown(&ptr, 4);
......@@ -1344,7 +1341,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d
hr = d3dcompiler_parse_type(type, data, offset);
if (FAILED(hr))
{
ERR("Failed to parse type info, hr %#x.\n", hr);
ERR("Failed to parse type info, hr %#lx.\n", hr);
HeapFree(GetProcessHeap(), 0, type);
return NULL;
}
......@@ -1401,7 +1398,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_
TRACE("Variable flags: %u\n", v->flags);
offset = read_dword(&ptr);
TRACE("Variable type offset: %x\n", offset);
TRACE("Variable type offset: %#lx.\n", offset);
v->type = get_reflection_type(cb->reflection, data, offset);
if (!v->type)
{
......@@ -1411,7 +1408,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_
}
offset = read_dword(&ptr);
TRACE("Variable default value offset: %x\n", offset);
TRACE("Variable default value offset: %#lx.\n", offset);
if (!copy_value(data + offset, &v->default_value, offset ? v->size : 0))
{
ERR("Failed to copy name.\n");
......@@ -1448,29 +1445,29 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c
DWORD target_version;
HRESULT hr;
TRACE("Size %u\n", size);
TRACE("Size %lu\n", size);
r->constant_buffer_count = read_dword(&ptr);
TRACE("Constant buffer count: %u\n", r->constant_buffer_count);
cbuffer_offset = read_dword(&ptr);
TRACE("Constant buffer offset: %#x\n", cbuffer_offset);
TRACE("Constant buffer offset: %#lx\n", cbuffer_offset);
r->bound_resource_count = read_dword(&ptr);
TRACE("Bound resource count: %u\n", r->bound_resource_count);
resource_offset = read_dword(&ptr);
TRACE("Bound resource offset: %#x\n", resource_offset);
TRACE("Bound resource offset: %#lx\n", resource_offset);
r->target = read_dword(&ptr);
TRACE("Target: %#x\n", r->target);
TRACE("Target: %#lx\n", r->target);
target_version = r->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK;
#if D3D_COMPILER_VERSION < 47
if (target_version >= 0x501)
{
WARN("Target version %#x is not supported in d3dcompiler %u.\n", target_version, D3D_COMPILER_VERSION);
WARN("Target version %#lx is not supported in d3dcompiler %u.\n", target_version, D3D_COMPILER_VERSION);
return E_INVALIDARG;
}
#endif
......@@ -1479,7 +1476,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c
TRACE("Flags: %u\n", r->flags);
creator_offset = read_dword(&ptr);
TRACE("Creator at offset %#x.\n", creator_offset);
TRACE("Creator at offset %#lx.\n", creator_offset);
if (!copy_name(data + creator_offset, &creator))
{
......@@ -1594,7 +1591,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c
TRACE("Variable count: %u\n", cb->variable_count);
offset = read_dword(&ptr);
TRACE("Variable offset: %x\n", offset);
TRACE("Variable offset: %#lx\n", offset);
hr = d3dcompiler_parse_variables(cb, data, data_size, data + offset);
if (hr != S_OK)
......@@ -1664,7 +1661,7 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *
}
count = read_dword(&ptr);
TRACE("%u elements\n", count);
TRACE("%lu elements\n", count);
skip_dword_unknown(&ptr, 1);
......@@ -1901,7 +1898,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_AddRef(ID3D10ShaderReflec
struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface);
ULONG refcount = InterlockedIncrement(&reflection->refcount);
TRACE("%p increasing refcount to %u.\n", reflection, refcount);
TRACE("%p increasing refcount to %lu.\n", reflection, refcount);
return refcount;
}
......@@ -1911,7 +1908,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderRefle
struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface);
ULONG refcount = InterlockedDecrement(&reflection->refcount);
TRACE("%p decreasing refcount to %u.\n", reflection, refcount);
TRACE("%p decreasing refcount to %lu.\n", reflection, refcount);
if (!refcount)
heap_free(reflection);
......
dlls/d3dcompiler_43/utils.c
View file @ 576cdea0
......@@ -21,9 +21,6 @@
*
*/
#ifndef WINE_NO_LONG_TYPES
#define WINE_NO_LONG_TYPES
#endif
#include <stdio.h>
#include "d3dcompiler_private.h"
......@@ -146,7 +143,7 @@ const char *debug_print_srcmod(DWORD mod)
WINE_D3DCOMPILER_TO_STR(BWRITERSPSM_ABSNEG);
WINE_D3DCOMPILER_TO_STR(BWRITERSPSM_NOT);
default:
FIXME("Unrecognized source modifier %#x.\n", mod);
FIXME("Unrecognized source modifier %#lx.\n", mod);
return "unrecognized_src_mod";
}
}
......@@ -207,15 +204,15 @@ static const char *get_regname(const struct shader_reg *reg)
switch (reg->type)
{
case BWRITERSPR_TEMP:
return wine_dbg_sprintf("r%u", reg->regnum);
return wine_dbg_sprintf("r%lu", reg->regnum);
case BWRITERSPR_INPUT:
return wine_dbg_sprintf("v%u", reg->regnum);
return wine_dbg_sprintf("v%lu", reg->regnum);
case BWRITERSPR_CONST:
return wine_dbg_sprintf("c%u", reg->regnum);
return wine_dbg_sprintf("c%lu", reg->regnum);
case BWRITERSPR_ADDR:
return wine_dbg_sprintf("a%u", reg->regnum);
return wine_dbg_sprintf("a%lu", reg->regnum);
case BWRITERSPR_TEXTURE:
return wine_dbg_sprintf("t%u", reg->regnum);
return wine_dbg_sprintf("t%lu", reg->regnum);
case BWRITERSPR_RASTOUT:
switch (reg->regnum)
{
......@@ -225,21 +222,21 @@ static const char *get_regname(const struct shader_reg *reg)
default: return "Unexpected RASTOUT";
}
case BWRITERSPR_ATTROUT:
return wine_dbg_sprintf("oD%u", reg->regnum);
return wine_dbg_sprintf("oD%lu", reg->regnum);
case BWRITERSPR_TEXCRDOUT:
return wine_dbg_sprintf("oT%u", reg->regnum);
return wine_dbg_sprintf("oT%lu", reg->regnum);
case BWRITERSPR_OUTPUT:
return wine_dbg_sprintf("o%u", reg->regnum);
return wine_dbg_sprintf("o%lu", reg->regnum);
case BWRITERSPR_CONSTINT:
return wine_dbg_sprintf("i%u", reg->regnum);
return wine_dbg_sprintf("i%lu", reg->regnum);
case BWRITERSPR_COLOROUT:
return wine_dbg_sprintf("oC%u", reg->regnum);
return wine_dbg_sprintf("oC%lu", reg->regnum);
case BWRITERSPR_DEPTHOUT:
return "oDepth";
case BWRITERSPR_SAMPLER:
return wine_dbg_sprintf("s%u", reg->regnum);
return wine_dbg_sprintf("s%lu", reg->regnum);
case BWRITERSPR_CONSTBOOL:
return wine_dbg_sprintf("b%u", reg->regnum);
return wine_dbg_sprintf("b%lu", reg->regnum);
case BWRITERSPR_LOOP:
return "aL";
case BWRITERSPR_MISCTYPE:
......@@ -250,11 +247,11 @@ static const char *get_regname(const struct shader_reg *reg)
default: return "unexpected misctype";
}
case BWRITERSPR_LABEL:
return wine_dbg_sprintf("l%u", reg->regnum);
return wine_dbg_sprintf("l%lu", reg->regnum);
case BWRITERSPR_PREDICATE:
return wine_dbg_sprintf("p%u", reg->regnum);
return wine_dbg_sprintf("p%lu", reg->regnum);
default:
return wine_dbg_sprintf("unknown regname %#x", reg->type);
return wine_dbg_sprintf("unknown regname %#lx", reg->type);
}
}
......@@ -323,7 +320,7 @@ static const char *debug_print_relarg(const struct shader_reg *reg)
short_swizzle = debug_print_swizzle(reg->rel_reg->u.swizzle);
if (reg->rel_reg->type == BWRITERSPR_ADDR)
return wine_dbg_sprintf("[a%u%s]", reg->rel_reg->regnum, short_swizzle);
return wine_dbg_sprintf("[a%lu%s]", reg->rel_reg->regnum, short_swizzle);
else if(reg->rel_reg->type == BWRITERSPR_LOOP && reg->rel_reg->regnum == 0)
return wine_dbg_sprintf("[aL%s]", short_swizzle);
else
......@@ -519,19 +516,19 @@ void skip_dword_unknown(const char **ptr, unsigned int count)
for (i = 0; i < count; ++i)
{
d = read_dword(ptr);
FIXME("\t0x%08x\n", d);
FIXME("\t0x%08lx\n", d);
}
}
static void write_dword_unknown(char **ptr, DWORD d)
{
FIXME("Writing unknown DWORD 0x%08x\n", d);
FIXME("Writing unknown DWORD 0x%08lx.\n", d);
write_dword(ptr, d);
}
HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD data_size)
{
TRACE("dxbc %p, tag %s, size %#x.\n", dxbc, debugstr_an((const char *)&tag, 4), data_size);
TRACE("dxbc %p, tag %s, size %#lx.\n", dxbc, debugstr_an((const char *)&tag, 4), data_size);
if (dxbc->count >= dxbc->size)
{
......@@ -605,7 +602,7 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc)
skip_dword_unknown(&ptr, 1);
total_size = read_dword(&ptr);
TRACE("total size: %#x\n", total_size);
TRACE("total size: %#lx\n", total_size);
if (data_size != total_size)
{
......@@ -614,7 +611,7 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc)
}
chunk_count = read_dword(&ptr);
TRACE("chunk count: %#x\n", chunk_count);
TRACE("chunk count: %#lx\n", chunk_count);
hr = dxbc_init(dxbc, chunk_count);
if (FAILED(hr))
......@@ -630,7 +627,7 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc)
DWORD chunk_offset;
chunk_offset = read_dword(&ptr);
TRACE("chunk %u at offset %#x\n", i, chunk_offset);
TRACE("chunk %u at offset %#lx\n", i, chunk_offset);
chunk_ptr = data + chunk_offset;
......
dlls/d3dcompiler_46/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_46.dll
IMPORTLIB = d3dcompiler_46
IMPORTS = dxguid uuid
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=46
EXTRADEFS = -DD3D_COMPILER_VERSION=46
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -Wb,--prefer-native
......
dlls/d3dcompiler_47/Makefile.in
View file @ 576cdea0
MODULE = d3dcompiler_47.dll
IMPORTLIB = d3dcompiler
IMPORTS = dxguid uuid
EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=47
EXTRADEFS = -DD3D_COMPILER_VERSION=47
PARENTSRC = ../d3dcompiler_43
EXTRADLLFLAGS = -Wb,--prefer-native
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment