Skip to content

Commit e78c09d

Browse files
committed
update readme + Tutorials: update for MacOS for OpenGL
1 parent f678159 commit e78c09d

File tree

13 files changed

+2714
-487
lines changed

13 files changed

+2714
-487
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ tutorials/.vs/
44
tutorials/Tutorials.sln
55
tutorials/Tutorials.VC.db
66
tutorials/Makefile
7+
**/.DS_Store

3rdParty/glew/bin/x86/glew32.dll

-330 KB
Binary file not shown.
File renamed without changes.

3rdParty/glew/include/GL/glew.h

Lines changed: 2443 additions & 392 deletions
Large diffs are not rendered by default.

3rdParty/glew/include/GL/glxew.h

Lines changed: 147 additions & 47 deletions
Large diffs are not rendered by default.

3rdParty/glew/include/GL/wglew.h

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
** The OpenGL Extension Wrangler Library
3+
** Copyright (C) 2008-2015, Nigel Stewart <nigels[]users sourceforge net>
34
** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
45
** Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
56
** Copyright (C) 2002, Lev Povalahev
@@ -182,6 +183,19 @@ typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, in
182183

183184
#endif /* WGL_ARB_buffer_region */
184185

186+
/* --------------------- WGL_ARB_context_flush_control --------------------- */
187+
188+
#ifndef WGL_ARB_context_flush_control
189+
#define WGL_ARB_context_flush_control 1
190+
191+
#define WGL_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB 0x0000
192+
#define WGL_CONTEXT_RELEASE_BEHAVIOR_ARB 0x2097
193+
#define WGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_ARB 0x2098
194+
195+
#define WGLEW_ARB_context_flush_control WGLEW_GET_VAR(__WGLEW_ARB_context_flush_control)
196+
197+
#endif /* WGL_ARB_context_flush_control */
198+
185199
/* ------------------------- WGL_ARB_create_context ------------------------ */
186200

187201
#ifndef WGL_ARB_create_context
@@ -928,6 +942,19 @@ typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcNa
928942

929943
#endif /* WGL_NV_copy_image */
930944

945+
/* ------------------------ WGL_NV_delay_before_swap ----------------------- */
946+
947+
#ifndef WGL_NV_delay_before_swap
948+
#define WGL_NV_delay_before_swap 1
949+
950+
typedef BOOL (WINAPI * PFNWGLDELAYBEFORESWAPNVPROC) (HDC hDC, GLfloat seconds);
951+
952+
#define wglDelayBeforeSwapNV WGLEW_GET_FUN(__wglewDelayBeforeSwapNV)
953+
954+
#define WGLEW_NV_delay_before_swap WGLEW_GET_VAR(__WGLEW_NV_delay_before_swap)
955+
956+
#endif /* WGL_NV_delay_before_swap */
957+
931958
/* -------------------------- WGL_NV_float_buffer -------------------------- */
932959

933960
#ifndef WGL_NV_float_buffer
@@ -1170,18 +1197,8 @@ typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT6
11701197

11711198
/* ------------------------------------------------------------------------- */
11721199

1173-
#ifdef GLEW_MX
1174-
#define WGLEW_FUN_EXPORT
1175-
#define WGLEW_VAR_EXPORT
1176-
#else
11771200
#define WGLEW_FUN_EXPORT GLEW_FUN_EXPORT
11781201
#define WGLEW_VAR_EXPORT GLEW_VAR_EXPORT
1179-
#endif /* GLEW_MX */
1180-
1181-
#ifdef GLEW_MX
1182-
struct WGLEWContextStruct
1183-
{
1184-
#endif /* GLEW_MX */
11851202

11861203
WGLEW_FUN_EXPORT PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL;
11871204

@@ -1291,6 +1308,8 @@ WGLEW_FUN_EXPORT PFNWGLDXUNREGISTEROBJECTNVPROC __wglewDXUnregisterObjectNV;
12911308

12921309
WGLEW_FUN_EXPORT PFNWGLCOPYIMAGESUBDATANVPROC __wglewCopyImageSubDataNV;
12931310

1311+
WGLEW_FUN_EXPORT PFNWGLDELAYBEFORESWAPNVPROC __wglewDelayBeforeSwapNV;
1312+
12941313
WGLEW_FUN_EXPORT PFNWGLCREATEAFFINITYDCNVPROC __wglewCreateAffinityDCNV;
12951314
WGLEW_FUN_EXPORT PFNWGLDELETEDCNVPROC __wglewDeleteDCNV;
12961315
WGLEW_FUN_EXPORT PFNWGLENUMGPUDEVICESNVPROC __wglewEnumGpuDevicesNV;
@@ -1334,6 +1353,7 @@ WGLEW_VAR_EXPORT GLboolean __WGLEW_3DFX_multisample;
13341353
WGLEW_VAR_EXPORT GLboolean __WGLEW_3DL_stereo_control;
13351354
WGLEW_VAR_EXPORT GLboolean __WGLEW_AMD_gpu_association;
13361355
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_buffer_region;
1356+
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_context_flush_control;
13371357
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context;
13381358
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_profile;
13391359
WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_robustness;
@@ -1371,6 +1391,7 @@ WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_swap_frame_usage;
13711391
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_DX_interop;
13721392
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_DX_interop2;
13731393
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_copy_image;
1394+
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_delay_before_swap;
13741395
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_float_buffer;
13751396
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_gpu_affinity;
13761397
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_multisample_coverage;
@@ -1382,33 +1403,18 @@ WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_vertex_array_range;
13821403
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_video_capture;
13831404
WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_video_output;
13841405
WGLEW_VAR_EXPORT GLboolean __WGLEW_OML_sync_control;
1385-
1386-
#ifdef GLEW_MX
1387-
}; /* WGLEWContextStruct */
1388-
#endif /* GLEW_MX */
1389-
13901406
/* ------------------------------------------------------------------------- */
13911407

1392-
#ifdef GLEW_MX
1393-
1394-
typedef struct WGLEWContextStruct WGLEWContext;
1395-
GLEWAPI GLenum GLEWAPIENTRY wglewContextInit (WGLEWContext *ctx);
1396-
GLEWAPI GLboolean GLEWAPIENTRY wglewContextIsSupported (const WGLEWContext *ctx, const char *name);
1397-
1398-
#define wglewInit() wglewContextInit(wglewGetContext())
1399-
#define wglewIsSupported(x) wglewContextIsSupported(wglewGetContext(), x)
1400-
1401-
#define WGLEW_GET_VAR(x) (*(const GLboolean*)&(wglewGetContext()->x))
1402-
#define WGLEW_GET_FUN(x) wglewGetContext()->x
1403-
1404-
#else /* GLEW_MX */
1408+
GLEWAPI GLenum GLEWAPIENTRY wglewInit ();
1409+
GLEWAPI GLboolean GLEWAPIENTRY wglewIsSupported (const char *name);
14051410

1411+
#ifndef WGLEW_GET_VAR
14061412
#define WGLEW_GET_VAR(x) (*(const GLboolean*)&x)
1407-
#define WGLEW_GET_FUN(x) x
1408-
1409-
GLEWAPI GLboolean GLEWAPIENTRY wglewIsSupported (const char *name);
1413+
#endif
14101414

1411-
#endif /* GLEW_MX */
1415+
#ifndef WGLEW_GET_FUN
1416+
#define WGLEW_GET_FUN(x) x
1417+
#endif
14121418

14131419
GLEWAPI GLboolean GLEWAPIENTRY wglewGetExtension (const char *name);
14141420

3rdParty/glew/lib/x86/glew.lib

-549 KB
Binary file not shown.

3rdParty/glew/libOsx64/libglew.a

711 KB
Binary file not shown.
File renamed without changes.

readme.md

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,54 @@
11

22

3+
# AMD Radeon:tm: ProRender SDK
4+
5+
AMD Radeon:tm: ProRender is a powerful physically-based rendering engine that enables creative professionals to produce stunningly photorealistic images.
6+
https://www.amd.com/en/technologies/radeon-prorender
7+
8+
This repo contains :
9+
- the AMD Radeon:tm: ProRender library: includes and built binaries.
10+
- some tutorials demo samples.
11+
12+
## Building and running the Tutorials
13+
14+
On Visual Studio:
15+
```
16+
> cd tutorials
17+
> ..\premake5\win\premake5.exe vs2019
18+
then open tutorials/Tutorials.sln
19+
```
20+
21+
On Linux:
22+
```
23+
> cd tutorials
24+
> ../premake5/linux64/premake5 gmake
25+
> make -j config=release_x64
26+
```
27+
28+
On MacOS:
29+
```
30+
> cd tutorials
31+
> ../premake5/osx/premake5 gmake
32+
> make -j config=release_x64
33+
```
34+
35+
To run a demo, just select the executable and start it, example:
36+
```
37+
> cd tutorials/Bin
38+
> ./21_material_layered64
39+
this demo generates the rendering output image: 21.png
40+
```
41+
42+
See detailed documentation at
43+
https://radeon-pro.github.io/RadeonProRenderDocs/sdk/tutorials.html
44+
45+
## Additional Info
46+
47+
- Radeon:tm: ProRender GPUOpen web site
48+
https://gpuopen.com/radeon-pro-render/
49+
50+
- Radeon:tm: ProRenderSDK documentation
51+
https://radeon-pro.github.io/RadeonProRenderDocs/sdk/about.html
52+
53+
54+

0 commit comments

Comments
 (0)