Commit graph

2205 commits

Author SHA1 Message Date
Branimir Karadžić
44304315b5 Merge pull request #358 from ajohnson23/master
Fixes error C4701 in renderer_d3d11.cpp on VC12 build
2015-04-23 08:58:44 -07:00
Andrew Johnson
158799e79c Fixes error C4701 in renderer_d3d11.cpp on VC12 build
renderer_d3d11.cpp(687, 0): error C4701: potentially uninitialized local variable 'adapter' used
2015-04-23 08:14:29 -07:00
Branimir Karadžić
4e431c99db EGL: Fixed use extension use. 2015-04-22 21:39:20 -07:00
Branimir Karadžić
ea375d5c03 Fixed MinGW compile error. 2015-04-22 19:43:19 -07:00
Branimir Karadžić
62c3653877 Merge pull request #356 from jdarpinian/shaderc
Stop hardcoding the GUID for ID3D11ShaderReflection.
2015-04-22 19:19:32 -07:00
James Darpinian
bc08ef142e Stop hardcoding the GUID for ID3D11ShaderReflection.
This GUID changes depending on what version of the DirectX SDK you have.
The GUID is defined in d3d11shader.h as a const global, not a preprocessor
macro, so this #ifndef was clobbering it always. This caused DX11 shader
compliation to fail when using the Windows 8.1 SDK.
2015-04-22 19:15:08 -07:00
Branimir Karadžić
0aa27c112f D3D11: Fixed default settings for user created device. 2015-04-22 15:30:01 -07:00
Branimir Karadžić
0da98e8645 Fixed creation of GLES3 textures with compute write flag. 2015-04-22 15:11:45 -07:00
Branimir Karadžić
cc6649db0d Cleanup. 2015-04-22 09:30:28 -07:00
Branimir Karadžić
d1093eace8 Fixed build. 2015-04-22 00:22:18 -07:00
Branimir Karadžić
391d96f4d8 Cleanup. 2015-04-21 20:44:46 -07:00
Branimir Karadžić
eea21fede2 Enabling KHR_debug on GLES. 2015-04-21 20:30:31 -07:00
Branimir Karadžić
0e4e120cc8 Updated to latest imgui. 2015-04-21 16:30:13 -07:00
Branimir Karadžić
f246fd29fa Added texture caps flag for compute image formats. 2015-04-21 15:44:16 -07:00
Branimir Karadžić
ccb0f73308 Updated compute shader image formats. 2015-04-21 11:49:28 -07:00
Branimir Karadžić
143628442c Removed use of memset from header file. 2015-04-21 11:48:58 -07:00
Branimir Karadžić
db59a9d44d Enabled texture*Lod for vertex shaders in GLES3+. 2015-04-21 10:58:35 -07:00
Branimir Karadžić
31357c8786 Fixed Linux build. 2015-04-20 19:05:41 -07:00
Branimir Karadžić
705b135666 Fixed EXT_shader_texture_lod ESSL extension for vertex shaders. 2015-04-20 18:10:41 -07:00
Branimir Karadžić
a528554e67 Cleanup passing platform window/context data. 2015-04-20 16:22:40 -07:00
Branimir Karadžić
7904b9d9dd Fixed issue #353. 2015-04-19 18:12:09 -07:00
Branimir Karadžić
11794da949 Cleanup. 2015-04-18 00:39:57 -07:00
Branimir Karadžić
8dc0603c80 Merge pull request #351 from ming4883/pull-request
Add GLSurfaceView / external EGLContext support on Android
2015-04-18 00:34:36 -07:00
Ka-ming Chan
9e7e143f21 Add GLSurfaceView / external EGLContext support on Android by skipping the creation of BGFX's eglContext if g_bgfxAndroidWindow is set to NULL 2015-04-18 15:26:17 +08:00
Branimir Karadžić
62d2d744f9 Merge branch 'master' of github.com:bkaradzic/bgfx 2015-04-17 19:27:38 -07:00
Branimir Karadžić
2b5c9c1ee2 Merge pull request #349 from MikePopoloski/master
Fixing crash on WP8 ARM
2015-04-17 19:27:27 -07:00
Mike Popoloski
117571231a Fixing crash on WP8 ARM
The ViewState struct is so big that it blows out the stack on ARM devices. This change promotes it to a member variable.
2015-04-17 22:06:09 -04:00
Branimir Karadžić
62c3d18ff8 Merge pull request #348 from jdarpinian/oculus
Minor Oculus changes
2015-04-17 12:00:44 -07:00
James Darpinian
b54d33cdf7 Initialize Oculus pose after reset.
Without this change the pose is uninitialized during the first frame which causes Oculus timewarp to warp the output in crazy ways.
2015-04-17 11:03:41 -07:00
James Darpinian
8a689fac0d Switch Oculus distortion to high quality mode. 2015-04-17 11:03:04 -07:00
James Darpinian
ee649f682e Fix crash on shutdown in HMD mode.
Presumably this crash is due to a bug in either the Oculus SDK or DirectX itself as changing the order of releasing these objects should not have any effect.
2015-04-17 10:55:47 -07:00
Branimir Karadžić
a555a112a6 Cleanup. 2015-04-16 21:53:26 -07:00
Branimir Karadžić
c8f1157f3b Fixed 15-shadowmaps-simple example. 2015-04-16 21:26:46 -07:00
Branimir Karadžić
4bc2df890a Make D3D11 work with outdated DXSDK. 2015-04-16 19:47:13 -07:00
Branimir Karadžić
a3a1127b4f Fixed MinGW build. 2015-04-16 19:28:18 -07:00
Branimir Karadžić
feafe43c35 Merge pull request #344 from MikePopoloski/master
This MakeWindowAssociation block got moved to the wrong branch of #if.
2015-04-16 19:02:32 -07:00
Mike Popoloski
4bc2e4ec10 This MakeWindowAssociation block got moved to the wrong branch of #if. 2015-04-16 21:47:41 -04:00
Branimir Karadžić
c954d3fe7a Merge pull request #343 from MikePopoloski/master
D3D11 downlevel hardware support
2015-04-16 16:33:52 -07:00
Mike Popoloski
3ed95c81f2 Adding proper caps support for D3D11 feature levels. 2015-04-16 19:24:28 -04:00
Mike Popoloski
b234364df9 Special casing texture2DLod for SM 2.0 targets
tex2Dlod and related functions are not supported in shader model 2.0 (or D3D11 feature level 9_x). This commit just aliases them to a straight texture lookup, which doesn't do the same thing but at least it won't fail to compile.
2015-04-16 19:24:27 -04:00
Mike Popoloski
121cc748c2 Fixing a shader linkage crash in D3D11 for 10level9 targets
Lower feature level targets in D3D11 also require SV_Position as an input param to the pixel shader, otherwise there are linkage mismatches between the vertex and pixel shaders.
2015-04-16 19:24:27 -04:00
Branimir Karadžić
8f5a00d15d Fixed C4267. 2015-04-16 15:52:26 -07:00
Branimir Karadžić
4e9b7baaf8 Fixed Android warnings. 2015-04-16 14:46:03 -07:00
Branimir Karadžić
b226afd391 Fixed OSX warnings. 2015-04-16 14:42:32 -07:00
Branimir Karadžić
457d585b6e Updated ocornut-imgui 1.38 WIP. 2015-04-16 14:36:15 -07:00
Branimir Karadžić
5c7986ad38 GL: Reset state when switching from compute to draw. 2015-04-16 11:38:46 -07:00
Branimir Karadžić
0d232051eb Fixed ImGui shutdown when using custom allocator. 2015-04-16 11:38:07 -07:00
Branimir Karadžić
66017329cc Merge pull request #341 from mmicko/master
Fixed initialization order warning
2015-04-16 08:42:43 -07:00
Miodrag Milanovic
6ca4a77353 Fixed initialization order warning 2015-04-16 14:23:02 +02:00
Branimir Karadžić
12998fe580 Update OVR pose. 2015-04-15 21:52:31 -07:00