lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 24.0.1+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2019-09-22 23:19:10 +02:00
parent b14f9eae6d
commit 5a730d6ec3
842 changed files with 42245 additions and 33385 deletions
Download patch file Download diff file Expand all files Collapse all files

52
libobs-opengl/gl-texturecube.c
View file

@ -18,14 +18,14 @@
#include "gl-subsystem.h"
static inline bool upload_texture_cube(struct gs_texture_cube *tex,
const uint8_t **data)
const uint8_t **data)
{
uint32_t row_size = tex->size * gs_get_format_bpp(tex->base.format);
uint32_t tex_size = tex->size * row_size / 8;
uint32_t row_size = tex->size * gs_get_format_bpp(tex->base.format);
uint32_t tex_size = tex->size * row_size / 8;
uint32_t num_levels = tex->base.levels;
bool compressed = gs_is_compressed_format(tex->base.format);
GLenum gl_type = get_gl_format_type(tex->base.format);
bool success = true;
bool compressed = gs_is_compressed_format(tex->base.format);
GLenum gl_type = get_gl_format_type(tex->base.format);
bool success = true;
uint32_t i;
if (!num_levels)
@ -38,10 +38,9 @@ static inline bool upload_texture_cube(struct gs_texture_cube *tex,
success = false;
if (!gl_init_face(target, gl_type, num_levels,
tex->base.gl_format,
tex->base.gl_internal_format,
compressed, tex->size, tex->size,
tex_size, &data))
tex->base.gl_format,
tex->base.gl_internal_format, compressed,
tex->size, tex->size, tex_size, &data))
success = false;
if (!gl_bind_texture(target, 0))
@ -59,30 +58,31 @@ static inline bool upload_texture_cube(struct gs_texture_cube *tex,
}
gs_texture_t *device_cubetexture_create(gs_device_t *device, uint32_t size,
enum gs_color_format color_format, uint32_t levels,
const uint8_t **data, uint32_t flags)
enum gs_color_format color_format,
uint32_t levels, const uint8_t **data,
uint32_t flags)
{
struct gs_texture_cube *tex = bzalloc(sizeof(struct gs_texture_cube));
tex->base.device = device;
tex->base.type = GS_TEXTURE_CUBE;
tex->base.format = color_format;
tex->base.levels = levels;
tex->base.gl_format = convert_gs_format(color_format);
tex->base.device = device;
tex->base.type = GS_TEXTURE_CUBE;
tex->base.format = color_format;
tex->base.levels = levels;
tex->base.gl_format = convert_gs_format(color_format);
tex->base.gl_internal_format = convert_gs_internal_format(color_format);
tex->base.gl_target = GL_TEXTURE_CUBE_MAP;
tex->base.is_render_target = (flags & GS_RENDER_TARGET) != 0;
tex->base.gen_mipmaps = (flags & GS_BUILD_MIPMAPS) != 0;
tex->size = size;
tex->base.gl_target = GL_TEXTURE_CUBE_MAP;
tex->base.is_render_target = (flags & GS_RENDER_TARGET) != 0;
tex->base.gen_mipmaps = (flags & GS_BUILD_MIPMAPS) != 0;
tex->size = size;
if (!gl_gen_textures(1, &tex->base.texture))
goto fail;
if (!upload_texture_cube(tex, data))
goto fail;
return (gs_texture_t*)tex;
return (gs_texture_t *)tex;
fail:
gs_cubetexture_destroy((gs_texture_t*)tex);
gs_cubetexture_destroy((gs_texture_t *)tex);
blog(LOG_ERROR, "device_cubetexture_create (GL) failed");
return NULL;
}
@ -112,7 +112,7 @@ static inline bool is_texture_cube(const gs_texture_t *tex, const char *func)
uint32_t gs_cubetexture_get_size(const gs_texture_t *cubetex)
{
const struct gs_texture_cube *cube =
(const struct gs_texture_cube*)cubetex;
(const struct gs_texture_cube *)cubetex;
if (!is_texture_cube(cubetex, "gs_cubetexture_get_size"))
return 0;
@ -120,8 +120,8 @@ uint32_t gs_cubetexture_get_size(const gs_texture_t *cubetex)
return cube->size;
}
enum gs_color_format gs_cubetexture_get_color_format(
const gs_texture_t *cubetex)
enum gs_color_format
gs_cubetexture_get_color_format(const gs_texture_t *cubetex)
{
return cubetex->format;
}