RPCS3/archived-rsx-program-decompiler
1
0
Fork 0
mirror of https://github.com/RPCS3/rsx_program_decompiler.git synced 2026-01-31 01:25:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation errors

Browse Source
This commit is contained in:
DH
2016-06-26 19:46:54 +03:00
parent 9f2d4c3c61
commit bd98db47a0
5 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rsx_decompiler/rsx_fp_decompiler.cpp
View File

@@ -158,7 +158,7 @@ namespace rsx
arg_mask += arg.mask[channel_to_index.at(channel)];
}
return float_point_expr<4>(arg.text, arg_mask, arg.is_single, arg.base_count);
return float_point_expr<4>(arg.text, arg_mask, arg.is_single, 4);
}
float_point_expr<4> src(context_t& context, int index, bool is_swizzle_as_dst = false) const

2
rsx_program_decompiler.sln
View File

@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsx_program_decompiler", "rsx_program_decompiler\rsx_program_decompiler.vcxproj", "{9DAF4DF3-0E31-4C55-B367-6992C35F89CE}"
ProjectSection(ProjectDependencies) = postProject

4
rsx_program_decompiler/rsx_program_decompiler.vcxproj
View File

@@ -79,7 +79,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<LibraryPath>$(SolutionDir)lib\$(Platform)-$(Configuration)\;$(LibraryPath)</LibraryPath>
<LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(LibraryPath)</LibraryPath>
<IncludePath>$(SolutionDir)common\include\;$(SolutionDir)rsx_program_decompiler_lib\;$(SolutionDir)shader_code/;$(SolutionDir)rsx_decompiler\;$(IncludePath)</IncludePath>
<OutDir>$(SolutionDir)bin\</OutDir>
<TargetName>$(ProjectName)-$(Platform)-$(Configuration)</TargetName>
@@ -89,7 +89,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<LibraryPath>$(SolutionDir)lib\$(Platform)-$(Configuration)\;$(LibraryPath)</LibraryPath>
<LibraryPath>$(SolutionDir)lib\$(Configuration)-$(Platform)\;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)bin\</OutDir>
<TargetName>$(ProjectName)-$(Platform)-$(Configuration)</TargetName>
<IntDir>$(SolutionDir)tmp\$(ProjectName)\$(Platform)-$(Configuration)\</IntDir>

76
shader_code/clike_builder.h
View File

@@ -4,45 +4,53 @@
namespace shader_code
{
enum predefined_function_class_t
{
predefined_function_texture_fetch,
predefined_function_texture_bias_fetch,
predefined_function_texture_lod_fetch,
predefined_function_texture_proj_fetch,
predefined_function_texture_grad_fetch
};
template<predefined_function_class_t Function>
struct predefined_function_name_t;
template<>
struct predefined_function_name_t<predefined_function_class_t::predefined_function_texture_fetch>
{
static constexpr auto name = "texture_fetch";
};
template<>
struct predefined_function_name_t<predefined_function_class_t::predefined_function_texture_bias_fetch>
{
static constexpr auto name = "texture_bias_fetch";
};
template<>
struct predefined_function_name_t<predefined_function_class_t::predefined_function_texture_lod_fetch>
{
static constexpr auto name = "texture_lod_fetch";
};
template<>
struct predefined_function_name_t<predefined_function_class_t::predefined_function_texture_proj_fetch>
{
static constexpr auto name = "texture_proj_fetch";
};
template<>
struct predefined_function_name_t<predefined_function_class_t::predefined_function_texture_grad_fetch>
{
static constexpr auto name = "texture_grad_fetch";
};
template<typename Language>
struct clike_builder : public clike_language, public builder
{
using language = Language;
template<clike_language::predefined_function_class_t Function>
struct predefined_function_name_t;
template<>
struct predefined_function_name_t<clike_language::predefined_function_class_t::predefined_function_texture_fetch>
{
static constexpr auto name = "texture_fetch";
};
template<>
struct predefined_function_name_t<clike_language::predefined_function_class_t::predefined_function_texture_bias_fetch>
{
static constexpr auto name = "texture_bias_fetch";
};
template<>
struct predefined_function_name_t<clike_language::predefined_function_class_t::predefined_function_texture_lod_fetch>
{
static constexpr auto name = "texture_lod_fetch";
};
template<>
struct predefined_function_name_t<clike_language::predefined_function_class_t::predefined_function_texture_proj_fetch>
{
static constexpr auto name = "texture_proj_fetch";
};
template<>
struct predefined_function_name_t<clike_language::predefined_function_class_t::predefined_function_texture_grad_fetch>
{
static constexpr auto name = "texture_grad_fetch";
};
template<clike_language::type_class_t Type, int Count>
struct type_helper_t : public clike_language::type_t<Type, Count>
{

9
shader_code/clike_language.h
View File

@@ -650,15 +650,6 @@ namespace shader_code
function_ddy
};
enum predefined_function_class_t
{
predefined_function_texture_fetch,
predefined_function_texture_bias_fetch,
predefined_function_texture_lod_fetch,
predefined_function_texture_proj_fetch,
predefined_function_texture_grad_fetch
};
template<typename Type>
static expression_t<(type_class_t)Type::type, Type::count> expression(const std::string& text, bool is_single = true)
{