scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 10:35:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added R5G6R5 texture format. Added VAO.

Browse source
This commit is contained in:
bkaradzic 2012-11-08 23:27:11 -08:00
parent bbb0139b13
commit 3df2825243
5 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/bgfx.h
View file

@ -238,6 +238,7 @@ namespace bgfx
XRGB8,
ARGB8,
ABGR16,
R5G6B5,
Count
};

4
src/glimports.h
View file

@ -120,6 +120,10 @@ GL_IMPORT(true, PFNGLGETQUERYOBJECTUI64VEXTPROC, glGetQueryObjectui64vE
GL_IMPORT(true, PFNGLSAMPLECOVERAGEARBPROC, glSampleCoverageARB);
GL_IMPORT(true, PFNGLBINDVERTEXARRAYPROC, glBindVertexArray);
GL_IMPORT(true, PFNGLDELETEVERTEXARRAYSPROC, glDeleteVertexArrays);
GL_IMPORT(true, PFNGLGENVERTEXARRAYSPROC, glGenVertexArrays);
#if BGFX_CONFIG_DEBUG_GREMEDY
GL_IMPORT(true, PFNGLSTRINGMARKERGREMEDYPROC, glStringMarkerGREMEDY);
GL_IMPORT(true, PFNGLFRAMETERMINATORGREMEDYPROC, glFrameTerminatorGREMEDY);

1
src/renderer_d3d11.cpp
View file

@ -96,6 +96,7 @@ namespace bgfx
{ DXGI_FORMAT_B8G8R8A8_UNORM, 4 },
{ DXGI_FORMAT_B8G8R8A8_UNORM, 4 },
{ DXGI_FORMAT_R16G16B16A16_FLOAT, 8 },
{ DXGI_FORMAT_B5G6R5_UNORM, 2 },
};
static const D3D11_INPUT_ELEMENT_DESC s_attrib[Attrib::Count] =

1
src/renderer_d3d9.cpp
View file

@ -130,6 +130,7 @@ namespace bgfx
{ D3DFMT_X8R8G8B8, 4 },
{ D3DFMT_A8R8G8B8, 4 },
{ D3DFMT_A16B16G16R16, 8 },
{ D3DFMT_R5G6B5, 2 },
};
static ExtendedFormat s_extendedFormats[ExtendedFormat::Count] =

26
src/renderer_gl.cpp
View file

@ -18,6 +18,7 @@
# define glProgramBinary glProgramBinaryOES
# define glGetProgramBinary glGetProgramBinaryOES
# define GL_PROGRAM_BINARY_LENGTH GL_PROGRAM_BINARY_LENGTH_OES
# define GL_HALF_FLOAT GL_HALF_FLOAT_OES
#endif // BGFX_CONFIG_RENDERER_OPENGLES2
namespace bgfx
@ -640,6 +641,7 @@ namespace bgfx
ARB_vertex_type_2_10_10_10_rev,
OES_vertex_type_10_10_10_2,
EXT_occlusion_query_boolean,
ARB_vertex_array_object,
ATI_meminfo,
NVX_gpu_memory_info,
@ -684,6 +686,7 @@ namespace bgfx
{ "GL_ARB_vertex_type_2_10_10_10_rev", false, true },
{ "GL_OES_vertex_type_10_10_10_2", false, true },
{ "GL_EXT_occlusion_query_boolean", false, true },
{ "GL_ARB_vertex_array_object", false, true },
{ "GL_ATI_meminfo", false, true },
{ "GL_NVX_gpu_memory_info", false, true },
};
@ -734,11 +737,7 @@ namespace bgfx
{
GL_UNSIGNED_BYTE,
GL_UNSIGNED_SHORT,
#if BGFX_CONFIG_RENDERER_OPENGL|BGFX_CONFIG_RENDERER_OPENGLES3
GL_HALF_FLOAT,
#else
GL_HALF_FLOAT_OES,
#endif // BGFX_CONFIG_RENDERER_OPENGL|BGFX_CONFIG_RENDERER_OPENGLES3
GL_FLOAT,
};
@ -810,18 +809,19 @@ namespace bgfx
static const TextureFormatInfo s_textureFormat[TextureFormat::Count] =
{
{ GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_ZERO, GL_ZERO, 4 },
{ GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_ZERO, GL_ZERO, 4 },
{ GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_ZERO, GL_ZERO, 4 },
{ GL_ZERO, GL_ZERO, GL_ZERO, 0 },
{ GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE, 1 },
{ GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, 4 },
{ GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, 4 },
{ GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_ZERO, GL_ZERO, 4 },
{ GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_ZERO, GL_ZERO, 4 },
{ GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_ZERO, GL_ZERO, 4 },
{ GL_ZERO, GL_ZERO, GL_ZERO, 0 },
{ GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE, 1 },
{ GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, 4 },
{ GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, 4 },
#if BGFX_CONFIG_RENDERER_OPENGL
{ GL_RGBA16, GL_RGBA, GL_UNSIGNED_SHORT, 8 },
{ GL_RGBA16, GL_RGBA, GL_HALF_FLOAT, 8 },
#else
{ GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, 8 },
{ GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, 8 },
#endif // BGFX_CONFIG_RENDERER_OPENGL
{ GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 2 },
};
const char* glslTypeName(GLuint _type)