mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-15 02:29:51 +01:00
Merge branch 'master' into TemporaryHackishBranch
# Conflicts: # GPU/Directx9/PixelShaderGeneratorDX9.cpp # GPU/Directx9/VertexShaderGeneratorDX9.cpp # GPU/GLES/FragmentShaderGeneratorGLES.cpp # GPU/GLES/VertexShaderGeneratorGLES.cpp # GPU/Vulkan/FragmentShaderGeneratorVulkan.cpp # Windows/GEDebugger/GEDebugger.h
This commit is contained in:
commit
0779db5935
257 files changed
+7754
-7633
No files matched your search
@@ -158,7 +158,7 @@ inline float Clampf(float val, float min, float max) {
|
||||
}
|
||||
|
||||
inline float Signf(float val) {
|
||||
return (0.0f < val) - (val < 0.0f);
|
||||
return (float)((0.0f < val) - (val < 0.0f));
|
||||
}
|
||||
|
||||
inline float LinearMapf(float val, float a0, float a1, float b0, float b1) {
|
||||
|
||||
Reference in new issue
Block a user