Skip to content

Fix reflection serialization for D3D11_SHADER_TYPE_DESC #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
killerdevildog wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix reflection serialization for D3D11_SHADER_TYPE_DESC #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99aadbd
Fix reflection serialization: add D3D11_SHADER_TYPE_DESC for variables
killerdevildog Feb 4, 2026
071fd99
Sync headers with bgfx integration
killerdevildog Feb 4, 2026
6f6bcc4
Force D3D_SVF_USED flag on all uniform variables
killerdevildog Feb 5, 2026
93bc7b3
Fix D3DDisassemble serialization mismatch
killerdevildog Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion d3d4linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ int main(void)
D3D11_SHADER_INPUT_BIND_DESC bind_desc;
D3D11_SHADER_VARIABLE_DESC variable_desc;
D3D11_SHADER_BUFFER_DESC buffer_desc;
D3D11_SHADER_TYPE_DESC type_desc;
D3D11_SHADER_DESC shader_desc;

ID3D11ShaderReflection *reflector = (ID3D11ShaderReflection *)object;
Expand Down Expand Up @@ -212,6 +213,12 @@ int main(void)
p.write_i64(variable_desc.DefaultValue ? 1 : 0);
if (variable_desc.DefaultValue)
p.write_raw(variable_desc.DefaultValue, variable_desc.Size);

/* Serialize D3D11_SHADER_TYPE_DESC for this variable */
ID3D11ShaderReflectionType *type = var->GetType();
type->GetDesc(&type_desc);
p.write_raw(&type_desc, sizeof(type_desc));
p.write_string(type_desc.Name ? type_desc.Name : "");
}
}
}
Expand Down Expand Up @@ -295,4 +302,3 @@ int main(void)

return EXIT_SUCCESS;
}

23 changes: 22 additions & 1 deletion include/d3d4linux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
#endif

#if !defined D3D4LINUX_WINE
# define D3D4LINUX_WINE "/usr/bin/wine64"
// Wine 11+ uses "wine" for both 32/64-bit, older versions use "wine64"
# define D3D4LINUX_WINE "/usr/bin/wine"
# define D3D4LINUX_WINE_FALLBACK "/usr/bin/wine64"
#endif

/*
Expand Down Expand Up @@ -81,6 +83,19 @@ struct ID3DInclude
// FIXME: unimplemented
};

struct ID3D11ShaderReflectionType
{
HRESULT GetDesc(D3D11_SHADER_TYPE_DESC *desc)
{
*desc = m_desc;
desc->Name = m_name.empty() ? nullptr : m_name.c_str();
return S_OK;
}

D3D11_SHADER_TYPE_DESC m_desc;
std::string m_name;
};

struct ID3D11ShaderReflectionVariable
{
HRESULT GetDesc(D3D11_SHADER_VARIABLE_DESC *desc)
Expand All @@ -91,7 +106,13 @@ struct ID3D11ShaderReflectionVariable
return S_OK;
}

ID3D11ShaderReflectionType *GetType()
{
return &m_type;
}

D3D11_SHADER_VARIABLE_DESC m_desc;
ID3D11ShaderReflectionType m_type;
std::vector<std::string> m_strings;
int m_has_default;
std::vector<uint8_t> m_default_value;
Expand Down
21 changes: 21 additions & 0 deletions include/d3d4linux_enums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,17 @@
#define D3DCOMPILE_SKIP_VALIDATION 0x0002
#define D3DCOMPILE_SKIP_OPTIMIZATION 0x0004
#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x0008
#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x0010
#define D3DCOMPILE_PARTIAL_PRECISION 0x0020
#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x0040
#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x0080
#define D3DCOMPILE_NO_PRESHADER 0x0100
#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x0200
#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x0400
#define D3DCOMPILE_ENABLE_STRICTNESS 0x0800
#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x1000
#define D3DCOMPILE_IEEE_STRICTNESS 0x2000
#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x40000

#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x4000
#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x0000
Expand Down Expand Up @@ -126,6 +134,19 @@ typedef enum D3D_REGISTER_COMPONENT_TYPE
}
D3D_REGISTER_COMPONENT_TYPE;

typedef enum D3D_MIN_PRECISION
{
D3D_MIN_PRECISION_DEFAULT = 0,
D3D_MIN_PRECISION_FLOAT_16 = 1,
D3D_MIN_PRECISION_FLOAT_2_8 = 2,
D3D_MIN_PRECISION_RESERVED = 3,
D3D_MIN_PRECISION_SINT_16 = 4,
D3D_MIN_PRECISION_UINT_16 = 5,
D3D_MIN_PRECISION_ANY_16 = 0xf0,
D3D_MIN_PRECISION_ANY_10 = 0xf1,
}
D3D_MIN_PRECISION;

typedef enum D3D_SHADER_INPUT_TYPE
{
D3D_SIT_CBUFFER = 0,
Expand Down
22 changes: 18 additions & 4 deletions include/d3d4linux_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ struct d3d4linux
p.write_i64(D3D4LINUX_OP_REFLECT);
p.write_i64(SrcDataSize);
p.write_raw(pSrcData, SrcDataSize);
p.write_i64(pInterface);
p.write_i64(D3D4LINUX_IID_SHADER_REFLECTION);
p.write_i64(D3D4LINUX_FINISHED);

HRESULT ret = p.read_i64();

if (SUCCEEDED(ret) && pInterface == IID_ID3D11ShaderReflection)
if (SUCCEEDED(ret) ) //&& pInterface == IID_ID3D11ShaderReflection)
{
ID3D11ShaderReflection *r = new ID3D11ShaderReflection;

Expand Down Expand Up @@ -135,13 +135,18 @@ struct d3d4linux
ID3D11ShaderReflectionVariable &var = buf.m_variables.back();

p.read_raw(&var.m_desc, sizeof(var.m_desc));
var.m_desc.uFlags |= D3D_SVF_USED; // Force all uniforms to be marked as used
var.m_strings.push_back(p.read_string());
var.m_has_default = p.read_i64();
if (var.m_has_default)
{
var.m_default_value.resize(var.m_desc.Size);
p.read_raw(var.m_default_value.data(), var.m_desc.Size);
}

// Read D3D11_SHADER_TYPE_DESC for this variable
p.read_raw(&var.m_type.m_desc, sizeof(var.m_type.m_desc));
var.m_type.m_name = p.read_string();
}
}

Expand Down Expand Up @@ -195,7 +200,8 @@ struct d3d4linux
p.write_raw(pSrcData, SrcDataSize);
p.write_i64(Flags);
p.write_i64(szComments ? 1 : 0);
p.write_string(szComments ? szComments : "");
if (szComments)
p.write_string(szComments);
p.write_i64(D3D4LINUX_FINISHED);

HRESULT ret = p.read_i64();
Expand Down Expand Up @@ -251,7 +257,16 @@ struct d3d4linux

char const *wine_var = getenv("D3D4LINUX_WINE");
if (!wine_var)
{
// Try Wine 11+ path first, then fall back to wine64
wine_var = D3D4LINUX_WINE;
if (access(wine_var, X_OK) != 0)
{
#if defined(D3D4LINUX_WINE_FALLBACK)
wine_var = D3D4LINUX_WINE_FALLBACK;
#endif
}
}

close(pipe_read[0]);
close(pipe_read[1]);
Expand Down Expand Up @@ -318,4 +333,3 @@ struct d3d4linux
pid_t m_pid;
};
};

18 changes: 10 additions & 8 deletions include/d3d4linux_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,16 @@ struct D3D_SHADER_DATA

struct D3D11_SIGNATURE_PARAMETER_DESC
{
char const *SemanticName;
uint32_t SemanticIndex;
uint32_t Register;
D3D_NAME SystemValueType;
D3D_REGISTER_COMPONENT_TYPE ComponentType;
uint8_t Mask;
uint8_t ReadWriteMask;
uint32_t Stream;
char const *SemanticName; // 8 bytes (pointer)
uint32_t SemanticIndex; // 4 bytes
uint32_t Register; // 4 bytes
D3D_NAME SystemValueType; // 4 bytes (enum)
D3D_REGISTER_COMPONENT_TYPE ComponentType; // 4 bytes (enum)
uint8_t Mask; // 1 byte
uint8_t ReadWriteMask; // 1 byte
uint8_t _padding[2]; // 2 bytes padding for alignment
uint32_t Stream; // 4 bytes
D3D_MIN_PRECISION MinPrecision; // 4 bytes (enum) + 4 bytes padding = 40 total
};

struct D3D11_SHADER_INPUT_BIND_DESC
Expand Down