scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-24 16:48:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup.

Browse source
This commit is contained in:
Branimir Karadžić 2015-10-23 20:52:22 -07:00
parent 6ffdb3e247
commit 1c51d81006
22 changed files with 97 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/01-cubes/cubes.cpp
View file

@ -57,14 +57,16 @@ static const uint16_t s_cubeIndices[36] =
class Cubes : public entry::AppI class Cubes : public entry::AppI
{ {
void init(int /*_argc*/, char** /*_argv*/) BX_OVERRIDE void init(int _argc, char** _argv) BX_OVERRIDE
{ {
Args args(_argc, _argv);
m_width = 1280; m_width = 1280;
m_height = 720; m_height = 720;
m_debug = BGFX_DEBUG_TEXT; m_debug = BGFX_DEBUG_TEXT;
m_reset = BGFX_RESET_VSYNC; m_reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(m_width, m_height, m_reset); bgfx::reset(m_width, m_height, m_reset);
// Enable debug text. // Enable debug text.

8
examples/02-metaballs/metaballs.cpp
View file

@ -4,7 +4,7 @@
*/ */
#include "common.h" #include "common.h"
#include <bgfx/bgfx.h> #include "bgfx_utils.h"
// embedded shaders // embedded shaders
#include "vs_metaballs.bin.h" #include "vs_metaballs.bin.h"
@ -464,14 +464,16 @@ uint32_t triangulate(uint8_t* _result, uint32_t _stride, const float* __restrict
class Metaballs : public entry::AppI class Metaballs : public entry::AppI
{ {
void init(int /*_argc*/, char** /*_argv*/) BX_OVERRIDE void init(int _argc, char** _argv) BX_OVERRIDE
{ {
Args args(_argc, _argv);
m_width = 1280; m_width = 1280;
m_height = 720; m_height = 720;
m_debug = BGFX_DEBUG_TEXT; m_debug = BGFX_DEBUG_TEXT;
m_reset = BGFX_RESET_VSYNC; m_reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(m_width, m_height, m_reset); bgfx::reset(m_width, m_height, m_reset);
// Enable debug text. // Enable debug text.

6
examples/03-raymarch/raymarch.cpp
View file

@ -102,14 +102,16 @@ void renderScreenSpaceQuad(uint32_t _view, bgfx::ProgramHandle _program, float _
} }
} }
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
// Enable debug text. // Enable debug text.

6
examples/04-mesh/mesh.cpp
View file

@ -6,14 +6,16 @@
#include "common.h" #include "common.h"
#include "bgfx_utils.h" #include "bgfx_utils.h"
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
// Enable debug text. // Enable debug text.

6
examples/05-instancing/instancing.cpp
View file

@ -55,14 +55,16 @@ static const uint16_t s_cubeIndices[36] =
6, 3, 7, 6, 3, 7,
}; };
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
// Enable debug text. // Enable debug text.

6
examples/06-bump/bump.cpp
View file

@ -105,14 +105,16 @@ static const uint16_t s_cubeIndices[36] =
class Bump : public entry::AppI class Bump : public entry::AppI
{ {
void init(int /*_argc*/, char** /*_argv*/) BX_OVERRIDE void init(int _argc, char** _argv) BX_OVERRIDE
{ {
Args args(_argc, _argv);
m_width = 1280; m_width = 1280;
m_height = 720; m_height = 720;
m_debug = BGFX_DEBUG_TEXT; m_debug = BGFX_DEBUG_TEXT;
m_reset = BGFX_RESET_VSYNC; m_reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(m_width, m_height, m_reset); bgfx::reset(m_width, m_height, m_reset);
// Enable debug text. // Enable debug text.

11
examples/07-callback/callback.cpp
View file

@ -364,8 +364,10 @@ private:
uint32_t m_maxBlocks; uint32_t m_maxBlocks;
}; };
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
BgfxCallback callback; BgfxCallback callback;
BgfxAllocator allocator; BgfxAllocator allocator;
@ -376,9 +378,10 @@ int _main_(int /*_argc*/, char** /*_argv*/)
bgfx::RendererType::Enum renderers[bgfx::RendererType::Count]; bgfx::RendererType::Enum renderers[bgfx::RendererType::Count];
uint8_t numRenderers = bgfx::getSupportedRenderers(renderers); uint8_t numRenderers = bgfx::getSupportedRenderers(renderers);
bgfx::init( bgfx::init(bgfx::RendererType::Count == args.m_type
renderers[bx::getHPCounter() % numRenderers] /* randomize renderer */ ? renderers[bx::getHPCounter() % numRenderers] /* randomize renderer */
, BGFX_PCI_ID_NONE : args.m_type
, args.m_pciId
, 0 , 0
, &callback // custom callback handler , &callback // custom callback handler
, &allocator // custom allocator , &allocator // custom allocator

9
examples/10-font/font.cpp
View file

@ -4,8 +4,8 @@
*/ */
#include "common.h" #include "common.h"
#include "bgfx_utils.h"
#include <bgfx/bgfx.h>
#include <bx/timer.h> #include <bx/timer.h>
#include <bx/string.h> #include <bx/string.h>
#include <bx/fpumath.h> #include <bx/fpumath.h>
@ -46,15 +46,16 @@ TrueTypeHandle loadTtf(FontManager* _fm, const char* _filePath)
return invalid; return invalid;
} }
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
// Enable debug text. // Enable debug text.

7
examples/11-fontsdf/fontsdf.cpp
View file

@ -64,15 +64,16 @@ TrueTypeHandle loadTtf(FontManager* _fm, const char* _filePath)
return invalid; return invalid;
} }
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
// Enable debug text. // Enable debug text.

6
examples/12-lod/lod.cpp
View file

@ -23,14 +23,16 @@ KnightPos knightTour[8*4] =
{7,1}, {6,3}, {5,1}, {7,0}, {6,2}, {4,3}, {3,1}, {2,3}, {7,1}, {6,3}, {5,1}, {7,0}, {6,2}, {4,3}, {3,1}, {2,3},
}; };
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
// Enable debug text. // Enable debug text.

6
examples/13-stencil/stencil.cpp
View file

@ -828,15 +828,17 @@ struct Mesh
GroupArray m_groups; GroupArray m_groups;
}; };
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
ViewState viewState(1280, 720); ViewState viewState(1280, 720);
ClearValues clearValues(0x30303000, 1.0f, 0); ClearValues clearValues(0x30303000, 1.0f, 0);
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(viewState.m_width, viewState.m_height, reset); bgfx::reset(viewState.m_width, viewState.m_height, reset);
// Enable debug text. // Enable debug text.

6
examples/14-shadowvolumes/shadowvolumes.cpp
View file

@ -1850,15 +1850,17 @@ bool clipTest(const float* _planes, uint8_t _planeNum, const Mesh& _mesh, const
return false; return false;
} }
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
ViewState viewState(1280, 720); ViewState viewState(1280, 720);
ClearValues clearValues = {0x00000000, 1.0f, 0}; ClearValues clearValues = {0x00000000, 1.0f, 0};
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(viewState.m_width, viewState.m_height, reset); bgfx::reset(viewState.m_width, viewState.m_height, reset);
// Enable debug text. // Enable debug text.

6
examples/15-shadowmaps-simple/shadowmaps_simple.cpp
View file

@ -66,14 +66,16 @@ static const uint16_t s_planeIndices[] =
1, 3, 2, 1, 3, 2,
}; };
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
bgfx::RendererType::Enum renderer = bgfx::getRendererType(); bgfx::RendererType::Enum renderer = bgfx::getRendererType();

6
examples/16-shadowmaps/shadowmaps.cpp
View file

@ -1313,15 +1313,17 @@ struct ShadowMapSettings
#undef IMGUI_FLOAT_PARAM #undef IMGUI_FLOAT_PARAM
}; };
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
ViewState viewState(1280, 720); ViewState viewState(1280, 720);
ClearValues clearValues(0x00000000, 1.0f, 0); ClearValues clearValues(0x00000000, 1.0f, 0);
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(viewState.m_width, viewState.m_height, reset); bgfx::reset(viewState.m_width, viewState.m_height, reset);
// Enable debug text. // Enable debug text.

12
examples/17-drawstress/drawstress.cpp
View file

@ -3,10 +3,10 @@
* License: http://www.opensource.org/licenses/BSD-2-Clause * License: http://www.opensource.org/licenses/BSD-2-Clause
*/ */
#include <bgfx/bgfx.h>
#include <bx/uint32_t.h>
#include "common.h" #include "common.h"
#include "bgfx_utils.h"
#include <bx/uint32_t.h>
#include "imgui/imgui.h" #include "imgui/imgui.h"
// embedded shaders // embedded shaders
@ -72,8 +72,10 @@ static const int64_t lowwm = 1000000/57;
class DrawStress : public entry::AppI class DrawStress : public entry::AppI
{ {
void init(int /*_argc*/, char** /*_argv*/) BX_OVERRIDE void init(int _argc, char** _argv) BX_OVERRIDE
{ {
Args args(_argc, _argv);
m_width = 1280; m_width = 1280;
m_height = 720; m_height = 720;
m_debug = BGFX_DEBUG_TEXT; m_debug = BGFX_DEBUG_TEXT;
@ -91,7 +93,7 @@ class DrawStress : public entry::AppI
m_deltaTimeAvgNs = 0; m_deltaTimeAvgNs = 0;
m_numFrames = 0; m_numFrames = 0;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(m_width, m_height, m_reset); bgfx::reset(m_width, m_height, m_reset);
const bgfx::Caps* caps = bgfx::getCaps(); const bgfx::Caps* caps = bgfx::getCaps();

6
examples/18-ibl/ibl.cpp
View file

@ -213,14 +213,16 @@ struct LightProbe
bgfx::TextureHandle m_texIrr; bgfx::TextureHandle m_texIrr;
}; };
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
// Enable debug text. // Enable debug text.

6
examples/19-oit/oit.cpp
View file

@ -146,14 +146,16 @@ void screenSpaceQuad(float _textureWidth, float _textureHeight, bool _originBott
} }
} }
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
// Create vertex stream declaration. // Create vertex stream declaration.

8
examples/20-nanovg/nanovg.cpp
View file

@ -22,11 +22,11 @@
// //
#include "common.h" #include "common.h"
#include "bgfx_utils.h"
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <bgfx/bgfx.h>
#include <bx/string.h> #include <bx/string.h>
#include <bx/timer.h> #include <bx/timer.h>
#include "entry/entry.h" #include "entry/entry.h"
@ -1201,14 +1201,16 @@ void renderDemo(struct NVGcontext* vg, float mx, float my, float width, float he
nvgRestore(vg); nvgRestore(vg);
} }
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
// Enable debug text. // Enable debug text.

6
examples/21-deferred/deferred.cpp
View file

@ -215,14 +215,16 @@ void screenSpaceQuad(float _textureWidth, float _textureHeight, float _texelHalf
class Deferred : public entry::AppI class Deferred : public entry::AppI
{ {
void init(int /*_argc*/, char** /*_argv*/) BX_OVERRIDE void init(int _argc, char** _argv) BX_OVERRIDE
{ {
Args args(_argc, _argv);
m_width = 1280; m_width = 1280;
m_height = 720; m_height = 720;
m_debug = BGFX_DEBUG_TEXT; m_debug = BGFX_DEBUG_TEXT;
m_reset = BGFX_RESET_VSYNC; m_reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(m_width, m_height, m_reset); bgfx::reset(m_width, m_height, m_reset);
// Enable m_debug text. // Enable m_debug text.

6
examples/22-windows/windows.cpp
View file

@ -92,14 +92,16 @@ static const InputBinding s_bindings[] =
INPUT_BINDING_END INPUT_BINDING_END
}; };
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
const bgfx::Caps* caps = bgfx::getCaps(); const bgfx::Caps* caps = bgfx::getCaps();

6
examples/23-vectordisplay/main.cpp
View file

@ -30,14 +30,16 @@ struct PosColorVertex
bgfx::VertexDecl PosColorVertex::ms_decl; bgfx::VertexDecl PosColorVertex::ms_decl;
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
const bgfx::RendererType::Enum renderer = bgfx::getRendererType(); const bgfx::RendererType::Enum renderer = bgfx::getRendererType();

6
examples/24-nbody/nbody.cpp
View file

@ -96,14 +96,16 @@ static const float s_quadVertices[] =
static const uint16_t s_quadIndices[] = { 0, 1, 2, 2, 3, 0, }; static const uint16_t s_quadIndices[] = { 0, 1, 2, 2, 3, 0, };
int _main_(int /*_argc*/, char** /*_argv*/) int _main_(int _argc, char** _argv)
{ {
Args args(_argc, _argv);
uint32_t width = 1280; uint32_t width = 1280;
uint32_t height = 720; uint32_t height = 720;
uint32_t debug = BGFX_DEBUG_TEXT; uint32_t debug = BGFX_DEBUG_TEXT;
uint32_t reset = BGFX_RESET_VSYNC; uint32_t reset = BGFX_RESET_VSYNC;
bgfx::init(); bgfx::init(args.m_type, args.m_pciId);
bgfx::reset(width, height, reset); bgfx::reset(width, height, reset);
// Enable debug text. // Enable debug text.