ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zzogl: fix wrong type access 

cmake: don't strip by default the binary in release mode
gsdx: disable the regeneration of ogl shader


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5806 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2014-01-10 20:25:03 +00:00
parent cf8912eb2c
commit 5309dd0e59
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/BuildParameters.cmake
View File

@ -34,14 +34,10 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Debug|Devel|Release")
message(STATUS "BuildType set to ${CMAKE_BUILD_TYPE} by default") message(STATUS "BuildType set to ${CMAKE_BUILD_TYPE} by default")
endif(NOT CMAKE_BUILD_TYPE MATCHES "Debug|Devel|Release") endif(NOT CMAKE_BUILD_TYPE MATCHES "Debug|Devel|Release")
# Initially stip was disabled on release build but it is not stackstrace friendly!
# It only cost several MB so disbable it by default
if(NOT DEFINED CMAKE_BUILD_STRIP) if(NOT DEFINED CMAKE_BUILD_STRIP)
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set(CMAKE_BUILD_STRIP TRUE)
message(STATUS "Enable the stripping by default in ${CMAKE_BUILD_TYPE} build !!!")
else(CMAKE_BUILD_TYPE STREQUAL "Release")
set(CMAKE_BUILD_STRIP FALSE) set(CMAKE_BUILD_STRIP FALSE)
message(STATUS "Disable the stripping by default in ${CMAKE_BUILD_TYPE} build !!!")
endif(CMAKE_BUILD_TYPE STREQUAL "Release")
endif(NOT DEFINED CMAKE_BUILD_STRIP) endif(NOT DEFINED CMAKE_BUILD_STRIP)
if(NOT DEFINED CMAKE_BUILD_PO) if(NOT DEFINED CMAKE_BUILD_PO)

5
linux_various/glsl2h.pl
View File

@ -23,7 +23,10 @@ eval {
my @gsdx_res = qw/convert.glsl interlace.glsl merge.glsl shadeboost.glsl tfx.glsl fxaa.fx/; my @gsdx_res = qw/convert.glsl interlace.glsl merge.glsl shadeboost.glsl tfx.glsl fxaa.fx/;
my $gsdx_path = File::Spec->catdir(dirname(abs_path($0)), "..", "plugins", "GSdx", "res"); my $gsdx_path = File::Spec->catdir(dirname(abs_path($0)), "..", "plugins", "GSdx", "res");
my $gsdx_out = File::Spec->catdir($gsdx_path, "glsl_source.h"); my $gsdx_out = File::Spec->catdir($gsdx_path, "glsl_source.h");
glsl2h($gsdx_path, $gsdx_out, \@gsdx_res); # Keep the old FXAA for now
print "Warning: the rebuilding of GSdx ogl shader was temporary disabled\n";
print "It will be reenabled when we got time to test Asmodean new fxaa shader\n";
#glsl2h($gsdx_path, $gsdx_out, \@gsdx_res);
my @zz_res = qw/ps2hw_gl4.glsl/; my @zz_res = qw/ps2hw_gl4.glsl/;
my $zz_path = File::Spec->catdir(dirname(abs_path($0)), "..", "plugins", "zzogl-pg", "opengl"); my $zz_path = File::Spec->catdir(dirname(abs_path($0)), "..", "plugins", "zzogl-pg", "opengl");

2
plugins/zzogl-pg-cg/opengl/GifTransfer.cpp
View File

@ -97,7 +97,7 @@ template<int index> void _GSgifTransfer(const u32 *pMem, u32 size)
if (path->tag.PRE && (path->tag.FLG == GIF_FLG_PACKED)) if (path->tag.PRE && (path->tag.FLG == GIF_FLG_PACKED))
{ {
u32 tagprim = path->tag.PRIM; u64 tagprim = path->tag.PRIM;
GIFRegHandlerPRIM((u32*)&tagprim); GIFRegHandlerPRIM((u32*)&tagprim);
} }
} }

2
plugins/zzogl-pg/opengl/GifTransfer.cpp
View File

@ -97,7 +97,7 @@ template<int index> void _GSgifTransfer(const u32 *pMem, u32 size)
if (path->tag.PRE && (path->tag.FLG == GIF_FLG_PACKED)) if (path->tag.PRE && (path->tag.FLG == GIF_FLG_PACKED))
{ {
u32 tagprim = path->tag.PRIM; u64 tagprim = path->tag.PRIM;
GIFRegHandlerPRIM((u32*)&tagprim); GIFRegHandlerPRIM((u32*)&tagprim);
} }
} }