Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
7b18fa2
xrRenderGL: Add OpenGL renderer from X-Ray 1.5.
CrossVR Nov 21, 2015
55d70bd
Externals: Add OpenGL renderer submodules.
CrossVR Nov 21, 2015
456c702
Externals: Add project file and dependency for glbinding.
CrossVR Nov 21, 2015
2ea745c
xrRenderPC_GL: Update project file.
CrossVR Nov 21, 2015
161f67a
xrRenderGL: Implement glHW to replace glRenderDeviceRender.
CrossVR Nov 21, 2015
681f4eb
xrRenderPC_GL: Use DX interface implementations.
CrossVR Nov 21, 2015
9c0fb6d
xrRender: Move Light_Render_Direct to a common folder.
CrossVR Nov 21, 2015
e4e7c13
rgl: Update header includes.
CrossVR Nov 21, 2015
4b68400
glHW: Add glClipControl.
CrossVR Nov 21, 2015
29e38f5
rgl: Fixup header.
CrossVR Nov 22, 2015
18be63b
xrEngine: Add OpenGL support.
CrossVR Nov 22, 2015
3988037
xrRenderPC_GL: Update project file.
CrossVR Nov 22, 2015
bf18a31
Externals: Downgrade glBinding to stable v1.1.0.
CrossVR Nov 22, 2015
769a401
xrRender: Implement OpenGL support in various headers.
CrossVR Nov 23, 2015
e809f75
rgl: Reimplement CRender based on R3 renderer.
CrossVR Nov 23, 2015
eca94e6
xrRender: Add various OpenGL implementations.
CrossVR Nov 23, 2015
6fc370d
xrRenderGL: Update various OpenGL implementations.
CrossVR Nov 23, 2015
b1c35af
CRender: Fix shader_compile() error handling.
CrossVR Nov 23, 2015
13d875c
glR_Backend_Runtime: Move framebuffer and program pipeline to HW.
CrossVR Nov 23, 2015
ada231a
HW: Add context pointer to instance.
CrossVR Nov 24, 2015
d1678e9
DrawUtils: Replace GLUtils by D3DUtils.
CrossVR Nov 24, 2015
d7a5034
R_DStreams: Merge OpenGL implementation.
CrossVR Nov 24, 2015
62600b4
rgl: Fix texture_load prototype.
CrossVR Nov 24, 2015
3f72d7f
D3DXRenderBase: Use modern clear functions.
CrossVR Nov 24, 2015
2b12176
CRender: Update r2_R_lights implementation.
CrossVR Nov 24, 2015
97d304d
R_constant_table: Fix parse() implementation signature.
CrossVR Nov 24, 2015
6392d30
Shader: Implement geometry shader support.
CrossVR Nov 24, 2015
2641b74
Blender_Recorder: Implement R3 recorder for OpenGL.
CrossVR Nov 24, 2015
16a2e39
xrRenderPC_GL: Remove missing files.
CrossVR Nov 24, 2015
d62c8e8
R_DStreams: Fix type casts.
CrossVR Nov 24, 2015
0ef0e08
Visuals: Add OpenGL implementations.
CrossVR Nov 24, 2015
e3be056
Interfaces: Fix implementations.
CrossVR Nov 24, 2015
1c9b7d9
rgl: Uncomment sync point members.
CrossVR Nov 24, 2015
6418f7e
r2_types: Update implementation.
CrossVR Nov 24, 2015
37182d8
gl_loader: Update implementation.
CrossVR Nov 24, 2015
8cbae00
xrRenderPC_GL: Update blenders to R3 generation.
CrossVR Nov 24, 2015
cb58db3
xrRenderPC_GL: Update render targets to R3 generation.
CrossVR Nov 24, 2015
68d49ab
gl_R_render: Update implementation.
CrossVR Nov 24, 2015
55f10b5
dxPixEventWrapper: Provide dummy PIX_EVENT macro for OpenGL.
CrossVR Nov 24, 2015
d0b9aff
ColorMapManager: Fix OpenGL implementation.
CrossVR Nov 25, 2015
31375c9
QueryHelper: Implement missing ReleaseQuery().
CrossVR Nov 25, 2015
bdfdf1a
xrRenderDX10: Move dx10MinMaxSMBlender to xrRenderDX10.
CrossVR Nov 25, 2015
009378b
xrRenderPC_GL: Fix blender implementation.
CrossVR Nov 25, 2015
3e48415
glR_Backend_Runtime: Enable geometry shaders.
CrossVR Nov 25, 2015
9d9d8c1
xrRender_console: Enable ultra and extreme quality settings for OpenGL.
CrossVR Nov 25, 2015
e19d65f
CRenderTarget: Implement OpenGL support, including MSAA.
CrossVR Nov 26, 2015
33affdb
xrRender: Add missing OpenGL implementations.
CrossVR Nov 26, 2015
f59ed27
CDetail: Don't use xrStripify for OpenGL.
CrossVR Nov 26, 2015
1feb9f5
CRender: Stub screenshot implementation.
CrossVR Nov 26, 2015
6ef385f
xrRenderPC_GL: Fix compilation.
CrossVR Nov 26, 2015
79c6868
QueryHelper: Fix R2 enum.
CrossVR Nov 26, 2015
4bbb6d8
xrRenderPC_GL: Fix compilation again.
CrossVR Nov 27, 2015
e2ad4c2
DStreams: Only delete buffers that have been allocated.
CrossVR Nov 27, 2015
d2eb042
xrPhysics: Replace 3rd party include directives by adding include dir…
CrossVR Nov 28, 2015
a5e6472
CBackend: Fix stackoverflow crash.
CrossVR Nov 28, 2015
b218be3
xr_ioc_cmd: Correctly select the OpenGL renderer.
CrossVR Nov 28, 2015
0dbd45b
CHW: Use the current video mode to create the depth render target.
CrossVR Nov 28, 2015
99a5494
CRender: Fix stack corruption.
CrossVR Nov 28, 2015
c93680d
CRender: Update shader path to OpenGL subfolder.
CrossVR Nov 28, 2015
d70bb4c
shaders: Add OpenGL stub shaders.
CrossVR Nov 28, 2015
e52288d
CResourceManager: Allow pass-through geometry shaders.
CrossVR Nov 28, 2015
b168e55
text: Add a name for the OpenGL renderer.
CrossVR Nov 28, 2015
5c54914
CBlender_Compile: Don't support double-sided stencils.
CrossVR Nov 29, 2015
f579ec5
CRender: Specify shadowmap texture format.
CrossVR Nov 29, 2015
4a9de05
CRenderTarget: Use the default framebuffer in case HW.pBaseRT is set.
CrossVR Nov 29, 2015
2ed4336
CHW: Bind the render target when clearing color/depth.
CrossVR Nov 29, 2015
055ffa5
shaders: Add LUA scripts for all shaders.
CrossVR Nov 29, 2015
acd4c37
rgl: Reset line counter in every shader include.
CrossVR Nov 29, 2015
b321fd4
rgl: Return error when shader compilation failed.
CrossVR Nov 29, 2015
5e0c02d
CResourceManager: Parse constants after compiling the shader.
CrossVR Nov 29, 2015
56981b2
R_constants: Set the geometry shader constants.
CrossVR Nov 29, 2015
c471388
shaders: Fix iostructs typo.
CrossVR Nov 29, 2015
75ce80f
shaders: Include the shared common header in common_iostructs.h.
CrossVR Nov 29, 2015
4ee1202
shaders: Add samplers.
CrossVR Nov 29, 2015
ca185f4
shaders: Fix dumb shader.
CrossVR Nov 29, 2015
0cbdf6d
CBlender_Compile: Add OpenGL-specific implementation.
CrossVR Dec 2, 2015
635f365
xrRenderPC_GL: Switch to the GL-specific blender code path.
CrossVR Dec 2, 2015
e6798d5
shaders: Edit blender scripts to use OpenGL samplers.
CrossVR Dec 2, 2015
8c9f0e3
CBlender_Screen_SET: Add OpenGL-specific implementation.
CrossVR Dec 2, 2015
7e5396d
shaders: Add yuv2rgb shader.
CrossVR Dec 2, 2015
87de9e7
gitignore: Add Nvidia NSight user file.
CrossVR Dec 7, 2015
d7380e1
EngineAPI: Make the OpenGL renderer the fourth renderer.
CrossVR Dec 7, 2015
4eca9c6
glbinding: Disable warning C4592.
CrossVR Dec 8, 2015
a4b56cd
CResourceManager: Fix vertex shader log prefix.
CrossVR Dec 9, 2015
e4c249b
Merge branch 'dev' of https://github.com/OpenXRay/xray-16 into opengl
CrossVR Dec 12, 2015
fde22e2
xrSASH: Implement renderer command-line parameters.
CrossVR Dec 12, 2015
6c589d2
CHW: Switch to GL_LOWER_LEFT until debugging can show the need for GL…
CrossVR Dec 12, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain

# Shaders are plain text
*.vs diff=astextplain
*.ps diff=astextplain
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# exclude all dot files except .gitignore
# exclude all dot files except .git files
.*
!.gitignore
!.git*

# exclude binaries and temporary files
bin/
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "src/Externals/glbinding"]
path = src/Externals/glbinding
url = https://github.com/cginternals/glbinding.git
[submodule "src/Externals/gli"]
path = src/Externals/gli
url = https://github.com/g-truc/gli
Loading