mpm11011
854919b5e2
Merge remote-tracking branch 'refs/remotes/RPCS3/master'
2016-03-19 13:51:44 -04:00
vlj
8f788cb522
Merge pull request #1602 from vlj/vulkan
...
Vulkan: some refactoring
2016-03-19 18:47:49 +01:00
Vincent Lejeune
6078f25aa7
vulkan: Split get_compatible_sampler_format in two
...
Component mapping is not a sampler parameter.
2016-03-19 18:23:26 +01:00
Vincent Lejeune
4484e8c3f0
vulkan: Move vk_wrap_mode and max_aniso to vkFormat
2016-03-19 18:12:43 +01:00
Vincent Lejeune
b6bcdade81
vulkan: Do not copy texture inside a render pass
2016-03-19 18:07:27 +01:00
mpm11011
6adf086ed1
Adding zlib to rpcs3/CMakeLists.txt
...
Fix zlib location in cmakelists
Potential fix to zlib include dir(s)
2016-03-19 12:47:07 -04:00
mpm11011
e7fc5228d5
MakeELF: Replaced wx streams with zlib functions
2016-03-18 23:36:08 -04:00
mpm11011
23f03a19e8
Added zlib directory to include dirs in props
2016-03-18 23:33:17 -04:00
mpm11011
2060f02636
End of Line Normalization
2016-03-18 23:14:52 -04:00
vlj
e34b5f1f55
Merge pull request #1599 from vlj/vulkan
...
Vulkan: Fixes
2016-03-19 01:13:33 +01:00
Vincent Lejeune
e083c1471c
vulkan: Fix crash at exit
2016-03-19 00:17:00 +01:00
Vincent Lejeune
d9eba43360
vulkan: Do not create empty render pass.
...
Fix a crash with radeon crimson drivers.
2016-03-19 00:16:59 +01:00
vlj
3506d03dc5
Merge pull request #1592 from vlj/vulkan
...
Vulkan: Avoid recreating render pass and descriptor set
2016-03-18 17:52:13 +01:00
Vincent Lejeune
24eb544046
vulkan: Move descriptor sets and layout in VKGSRender class
...
They're now shared between all programs.
2016-03-18 00:08:28 +01:00
Vincent Lejeune
6a1f0aed36
vulkan: Precompute all possibles render pass
2016-03-18 00:08:28 +01:00
vlj
a0c433a065
Merge pull request #1587 from vlj/vulkan
...
Vulkan: Use a common descriptor layout for all program
2016-03-17 20:50:49 +01:00
Vincent Lejeune
6229733fbb
vulkan: Use a shared pipeline layout
2016-03-17 20:03:09 +01:00
Vincent Lejeune
7e971eb032
vulkan: Fix for get_memory_mapping
2016-03-17 20:03:09 +01:00
vlj
01ce1c31d1
Merge pull request #1580 from MyaniPT/patch-1
...
Updates stblibs (stb_image and stb_truetype)
2016-03-17 20:01:55 +01:00
AnnieL
212fd4b340
Adds the stb_truetype Mac OSX fix from 64cfab5
...
Adds the stb_truetype Mac OSX fix from 64cfab5
Removes stb_image.c from the Visual Studio Project files since it got
deleted in previous commit
2016-03-17 18:03:59 +00:00
AnnieL
659f3d856a
Update stb_truetype from 0.7 to 1.09
...
Updates stb_truetype.h from 0.7 to 1.09
Fixes '>=' signed/unsigned mismatch at cellFont.cpp lines 328 and 333 by
making both values unsigned (u32)
2016-03-17 18:03:59 +00:00
AnnieL
8cded28c45
Updates stb_image from 1.33 to 2.10
...
Updates stb_image from 1.33 to 2.10 which deprecates stb_image.c and
uses only stb_image.h
2016-03-17 18:03:59 +00:00
vlj
454fbce4c6
Merge pull request #1589 from kd-11/vulkan-wip
...
vk: Indexing into mipmap lod is scalar not vector
2016-03-17 18:52:30 +01:00
kd-11
26738762ea
vk: Indexing into mipmap lod is scalor not vector
2016-03-17 19:43:41 +03:00
vlj
cd5edc38ff
Merge pull request #1585 from MyaniPT/patch-2
...
Fixes #1584 (Vulkan not being usable in non-w10 systems)
2016-03-17 14:39:54 +01:00
AnnieL
5250911a40
Fixes #1584
...
When DirectX 12 is missing, the emulator thinks Vulkan = DirectX 12 because Vulkan takes DX12's place in the box (id=2), and therefore runs DX12 when Vulkan is selected, crashing the emulator with an unhandled exception.
Fixes it by translating renderer string value to the respective enum class before sending the value to config.h instead of just relying on the box's selected id -> cbox_gs_render->GetSelection()
Also changes the order of the renderers (for convinience, now DX12 is id=3) from
Null, OpenGL, DirectX 12, Vulkan
to
Null, OpenGL, Vulkan, DirectX 12
2016-03-17 10:04:03 +00:00
vlj
45e48c2499
Merge pull request #1575 from kd-11/gl_canvas_fix
...
gl: Explicitly declare context attributes for GL canvas
2016-03-17 02:04:14 +01:00
kd-11
15901589a5
Explicitly declare context attributes for GL canvas
2016-03-16 08:35:19 +03:00
vlj
bdecd3c180
Merge pull request #1576 from vlj/vulkan
...
Vulkan: Turn uniform/index buffer into ring allocated buffer
2016-03-15 23:50:38 +01:00
Vincent Lejeune
61de5e8835
vulkan: Clear swapchain before usage.
...
Fix VkQueuePresentKHR error messages
2016-03-15 22:03:24 +01:00
Vincent Lejeune
3b3fffa962
vulkan: Remove redundant texture::create/init overloads
2016-03-15 22:03:24 +01:00
Vincent Lejeune
63ad2cce72
vulkan: Use ring allocation for uniform/index buffers by using simpler memory_block and buffer class.
2016-03-15 22:03:24 +01:00
Vincent Lejeune
da2caa0881
vulkan: precompute memory type mapping.
2016-03-15 22:02:30 +01:00
vlj
93b06f2a39
Merge pull request #1578 from kd-11/vulkan-wip
...
vk: Re-enable fog parameters for vulkan
2016-03-15 21:54:40 +01:00
kd-11
f2d5542e66
Re-enable fog parameters for vulkan
2016-03-15 22:32:32 +03:00
vlj
7584f29ec7
Merge pull request #1562 from MyaniPT/patch-1
...
Set Write/Read Color/Depth Buffers to false by default
2016-03-14 22:14:01 +01:00
AnnieL
9fd244cf9c
Set Write/Read Color/Depth Buffers to false by default
...
Since they're not working properly right now, there's no reason for them to be enabled by default.
2016-03-14 19:06:20 +00:00
vlj
bb722d5824
Merge pull request #1573 from vlj/rsx
...
rsx/common/d3d12/gl/vulkan: Unify texture upload code.
2016-03-14 20:05:32 +01:00
Vincent Lejeune
5de70628d7
rsx/common/d3d12/gl/vulkan: Unify texture upload code.
2016-03-14 19:10:51 +01:00
Raul Tambre
e33c684b49
Merge pull request #1564 from kd-11/vulkan-wip
...
vk/gl: Add some more blend ops for vulkan; fix immutable storage for opengl
2016-03-14 19:38:37 +02:00
kd-11
d9dbb1565a
Immutable textures cannot be reused!
2016-03-14 18:14:06 +03:00
kd-11
34992d8a8f
vk: Add some more blend ops
2016-03-14 18:14:06 +03:00
Ivan
9d7c186a4f
Merge pull request #1571 from tambry/build_fix
...
Fix Release build
2016-03-13 21:02:28 +03:00
Nekotekina
702193a6c7
Build fixed
2016-03-13 19:39:54 +02:00
vlj
bbe00f6505
Merge pull request #1569 from vlj/vulkan
...
vulkan: Zero initialize as much structure info as possible.
2016-03-13 00:10:11 +01:00
Vincent Lejeune
70a80b84d7
vulkan: Zero initialize as much structure info as possible.
...
This fixes a crash with nvidia driver in present call (likely because of
some uninitialized member)
2016-03-12 22:22:28 +01:00
vlj
c8cc681591
Merge pull request #1566 from vlj/vulkan
...
Vulkan: Uses d24_s8 or d32_s8 depending on availability.
2016-03-12 19:39:46 +01:00
Vincent Lejeune
8604f5a02f
vulkan: Use d24_u8 or d32_u8 depending on hw support.
2016-03-12 15:56:23 +01:00
Vincent Lejeune
26ff4fd6b7
vulkan: Uses debug output setting to enable debug layers.
2016-03-12 15:23:39 +01:00
vlj
4bfd019c0d
Merge pull request #1563 from kd-11/rsx_texture_formats
...
rsx: support for more formats
2016-03-12 01:43:37 +01:00