mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-14 23:34:08 +00:00
Add dummy GL texture flag & direct object access
- Add dummy GL texture support to allow libobs texture references to be created for GL without - Add a texture_getobj function to allow the retrieval of the context-specific object, such as the D3D texture pointer, or the OpenGL texture object handle. - Also cleaned up the export stuff. I realized it was all totally superfluous. Kind of a dumb moment, but nice to clean it up regardless.
This commit is contained in:
parent
6da26a3a1c
commit
0a86e8fb3f
|
@ -1477,6 +1477,15 @@ void texture_unmap(texture_t tex)
|
|||
tex2d->device->context->Unmap(tex2d->texture, 0);
|
||||
}
|
||||
|
||||
void *texture_getobj(texture_t tex)
|
||||
{
|
||||
if (tex->type != GS_TEXTURE_2D)
|
||||
return nullptr;
|
||||
|
||||
gs_texture_2d *tex2d = static_cast<gs_texture_2d*>(tex);
|
||||
return tex2d->texture.Get();
|
||||
}
|
||||
|
||||
|
||||
void cubetexture_destroy(texture_t cubetex)
|
||||
{
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include <util/base.h>
|
||||
#include <graphics/matrix4.h>
|
||||
#include <graphics/graphics.h>
|
||||
#include <graphics/device-exports.h>
|
||||
#include <util/windows/ComPtr.hpp>
|
||||
#include <util/windows/HRError.hpp>
|
||||
|
||||
|
@ -37,8 +38,6 @@ struct shader_var;
|
|||
struct shader_sampler;
|
||||
struct gs_vertex_shader;
|
||||
|
||||
#include "d3d11-exports.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,195 +0,0 @@
|
|||
/******************************************************************************
|
||||
Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
******************************************************************************/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <util/c99defs.h>
|
||||
|
||||
EXPORT const char *device_preprocessor_name(void);
|
||||
EXPORT device_t device_create(struct gs_init_data *data);
|
||||
EXPORT void device_destroy(device_t device);
|
||||
EXPORT void device_entercontext(device_t device);
|
||||
EXPORT void device_leavecontext(device_t device);
|
||||
EXPORT swapchain_t device_create_swapchain(device_t device,
|
||||
struct gs_init_data *data);
|
||||
EXPORT void device_resize(device_t device, uint32_t x, uint32_t y);
|
||||
EXPORT void device_getsize(device_t device, uint32_t *x, uint32_t *y);
|
||||
EXPORT uint32_t device_getwidth(device_t device);
|
||||
EXPORT uint32_t device_getheight(device_t device);
|
||||
EXPORT texture_t device_create_texture(device_t device, uint32_t width,
|
||||
uint32_t height, enum gs_color_format color_format,
|
||||
uint32_t levels, const void **data, uint32_t flags);
|
||||
EXPORT texture_t device_create_cubetexture(device_t device, uint32_t size,
|
||||
enum gs_color_format color_format, uint32_t levels,
|
||||
const void **data, uint32_t flags);
|
||||
EXPORT texture_t device_create_volumetexture(device_t device, uint32_t width,
|
||||
uint32_t height, uint32_t depth,
|
||||
enum gs_color_format color_format, uint32_t levels,
|
||||
const void **data, uint32_t flags);
|
||||
EXPORT zstencil_t device_create_zstencil(device_t device, uint32_t width,
|
||||
uint32_t height, enum gs_zstencil_format format);
|
||||
EXPORT stagesurf_t device_create_stagesurface(device_t device, uint32_t width,
|
||||
uint32_t height, enum gs_color_format color_format);
|
||||
EXPORT samplerstate_t device_create_samplerstate(device_t device,
|
||||
struct gs_sampler_info *info);
|
||||
EXPORT shader_t device_create_vertexshader(device_t device,
|
||||
const char *shader, const char *file,
|
||||
char **error_string);
|
||||
EXPORT shader_t device_create_pixelshader(device_t device,
|
||||
const char *shader, const char *file,
|
||||
char **error_string);
|
||||
EXPORT vertbuffer_t device_create_vertexbuffer(device_t device,
|
||||
struct vb_data *data, uint32_t flags);
|
||||
EXPORT indexbuffer_t device_create_indexbuffer(device_t device,
|
||||
enum gs_index_type type, void *indices, size_t num,
|
||||
uint32_t flags);
|
||||
EXPORT enum gs_texture_type device_gettexturetype(texture_t texture);
|
||||
EXPORT void device_load_vertexbuffer(device_t device, vertbuffer_t vertbuffer);
|
||||
EXPORT void device_load_indexbuffer(device_t device, indexbuffer_t indexbuffer);
|
||||
EXPORT void device_load_texture(device_t device, texture_t tex, int unit);
|
||||
EXPORT void device_load_samplerstate(device_t device,
|
||||
samplerstate_t samplerstate, int unit);
|
||||
EXPORT void device_load_vertexshader(device_t device, shader_t vertshader);
|
||||
EXPORT void device_load_pixelshader(device_t device, shader_t pixelshader);
|
||||
EXPORT void device_load_defaultsamplerstate(device_t device, bool b_3d,
|
||||
int unit);
|
||||
EXPORT shader_t device_getvertexshader(device_t device);
|
||||
EXPORT shader_t device_getpixelshader(device_t device);
|
||||
EXPORT texture_t device_getrendertarget(device_t device);
|
||||
EXPORT zstencil_t device_getzstenciltarget(device_t device);
|
||||
EXPORT void device_setrendertarget(device_t device, texture_t tex,
|
||||
zstencil_t zstencil);
|
||||
EXPORT void device_setcuberendertarget(device_t device, texture_t cubetex,
|
||||
int side, zstencil_t zstencil);
|
||||
EXPORT void device_copy_texture(device_t device, texture_t dst, texture_t src);
|
||||
EXPORT void device_stage_texture(device_t device, stagesurf_t dst,
|
||||
texture_t src);
|
||||
EXPORT void device_beginscene(device_t device);
|
||||
EXPORT void device_draw(device_t device, enum gs_draw_mode draw_mode,
|
||||
uint32_t start_vert, uint32_t num_verts);
|
||||
EXPORT void device_endscene(device_t device);
|
||||
EXPORT void device_load_swapchain(device_t device, swapchain_t swapchain);
|
||||
EXPORT void device_clear(device_t device, uint32_t clear_flags,
|
||||
struct vec4 *color, float depth, uint8_t stencil);
|
||||
EXPORT void device_present(device_t device);
|
||||
EXPORT void device_setcullmode(device_t device, enum gs_cull_mode mode);
|
||||
EXPORT enum gs_cull_mode device_getcullmode(device_t device);
|
||||
EXPORT void device_enable_blending(device_t device, bool enable);
|
||||
EXPORT void device_enable_depthtest(device_t device, bool enable);
|
||||
EXPORT void device_enable_stenciltest(device_t device, bool enable);
|
||||
EXPORT void device_enable_stencilwrite(device_t device, bool enable);
|
||||
EXPORT void device_enable_color(device_t device, bool red, bool green,
|
||||
bool blue, bool alpha);
|
||||
EXPORT void device_blendfunction(device_t device, enum gs_blend_type src,
|
||||
enum gs_blend_type dest);
|
||||
EXPORT void device_depthfunction(device_t device, enum gs_depth_test test);
|
||||
EXPORT void device_stencilfunction(device_t device, enum gs_stencil_side side,
|
||||
enum gs_depth_test test);
|
||||
EXPORT void device_stencilop(device_t device, enum gs_stencil_side side,
|
||||
enum gs_stencil_op fail, enum gs_stencil_op zfail,
|
||||
enum gs_stencil_op zpass);
|
||||
EXPORT void device_enable_fullscreen(device_t device, bool enable);
|
||||
EXPORT int device_fullscreen_enabled(device_t device);
|
||||
EXPORT void device_setdisplaymode(device_t device,
|
||||
const struct gs_display_mode *mode);
|
||||
EXPORT void device_getdisplaymode(device_t device,
|
||||
struct gs_display_mode *mode);
|
||||
EXPORT void device_setcolorramp(device_t device, float gamma, float brightness,
|
||||
float contrast);
|
||||
EXPORT void device_setviewport(device_t device, int x, int y, int width,
|
||||
int height);
|
||||
EXPORT void device_getviewport(device_t device, struct gs_rect *rect);
|
||||
EXPORT void device_setscissorrect(device_t device, struct gs_rect *rect);
|
||||
EXPORT void device_ortho(device_t device, float left, float right,
|
||||
float top, float bottom, float znear, float zfar);
|
||||
EXPORT void device_frustum(device_t device, float left, float right,
|
||||
float top, float bottom, float znear, float zfar);
|
||||
EXPORT void device_projection_push(device_t device);
|
||||
EXPORT void device_projection_pop(device_t device);
|
||||
|
||||
EXPORT void swapchain_destroy(swapchain_t swapchain);
|
||||
|
||||
EXPORT void texture_destroy(texture_t tex);
|
||||
EXPORT uint32_t texture_getwidth(texture_t tex);
|
||||
EXPORT uint32_t texture_getheight(texture_t tex);
|
||||
EXPORT enum gs_color_format texture_getcolorformat(texture_t tex);
|
||||
EXPORT bool texture_map(texture_t tex, void **ptr, uint32_t *linesize);
|
||||
EXPORT void texture_unmap(texture_t tex);
|
||||
EXPORT bool texture_isrect(texture_t tex);
|
||||
|
||||
EXPORT void cubetexture_destroy(texture_t cubetex);
|
||||
EXPORT uint32_t cubetexture_getsize(texture_t cubetex);
|
||||
EXPORT enum gs_color_format cubetexture_getcolorformat(texture_t cubetex);
|
||||
|
||||
EXPORT void volumetexture_destroy(texture_t voltex);
|
||||
EXPORT uint32_t volumetexture_getwidth(texture_t voltex);
|
||||
EXPORT uint32_t volumetexture_getheight(texture_t voltex);
|
||||
EXPORT uint32_t volumetexture_getdepth(texture_t voltex);
|
||||
EXPORT enum gs_color_format volumetexture_getcolorformat(texture_t voltex);
|
||||
|
||||
EXPORT void stagesurface_destroy(stagesurf_t stagesurf);
|
||||
EXPORT uint32_t stagesurface_getwidth(stagesurf_t stagesurf);
|
||||
EXPORT uint32_t stagesurface_getheight(stagesurf_t stagesurf);
|
||||
EXPORT enum gs_color_format stagesurface_getcolorformat(stagesurf_t stagesurf);
|
||||
EXPORT bool stagesurface_map(stagesurf_t stagesurf, uint8_t **data,
|
||||
uint32_t *linesize);
|
||||
EXPORT void stagesurface_unmap(stagesurf_t stagesurf);
|
||||
|
||||
EXPORT void zstencil_destroy(zstencil_t zstencil);
|
||||
|
||||
EXPORT void samplerstate_destroy(samplerstate_t samplerstate);
|
||||
|
||||
EXPORT void vertexbuffer_destroy(vertbuffer_t vertbuffer);
|
||||
EXPORT void vertexbuffer_flush(vertbuffer_t vertbuffer, bool rebuild);
|
||||
EXPORT struct vb_data *vertexbuffer_getdata(vertbuffer_t vertbuffer);
|
||||
|
||||
EXPORT void indexbuffer_destroy(indexbuffer_t indexbuffer);
|
||||
EXPORT void indexbuffer_flush(indexbuffer_t indexbuffer);
|
||||
EXPORT void *indexbuffer_getdata(indexbuffer_t indexbuffer);
|
||||
EXPORT size_t indexbuffer_numindices(indexbuffer_t indexbuffer);
|
||||
EXPORT enum gs_index_type indexbuffer_gettype(indexbuffer_t indexbuffer);
|
||||
|
||||
EXPORT void shader_destroy(shader_t shader);
|
||||
EXPORT int shader_numparams(shader_t shader);
|
||||
EXPORT sparam_t shader_getparambyidx(shader_t shader, uint32_t param);
|
||||
EXPORT sparam_t shader_getparambyname(shader_t shader, const char *name);
|
||||
EXPORT void shader_getparaminfo(shader_t shader, sparam_t param,
|
||||
struct shader_param_info *info);
|
||||
EXPORT sparam_t shader_getviewprojmatrix(shader_t shader);
|
||||
EXPORT sparam_t shader_getworldmatrix(shader_t shader);
|
||||
EXPORT void shader_setbool(shader_t shader, sparam_t param, bool val);
|
||||
EXPORT void shader_setfloat(shader_t shader, sparam_t param, float val);
|
||||
EXPORT void shader_setint(shader_t shader, sparam_t param, int val);
|
||||
EXPORT void shader_setmatrix3(shader_t shader, sparam_t param,
|
||||
const struct matrix3 *val);
|
||||
EXPORT void shader_setmatrix4(shader_t shader, sparam_t param,
|
||||
const struct matrix4 *val);
|
||||
EXPORT void shader_setvec2(shader_t shader, sparam_t param,
|
||||
const struct vec2 *val);
|
||||
EXPORT void shader_setvec3(shader_t shader, sparam_t param,
|
||||
const struct vec3 *val);
|
||||
EXPORT void shader_setvec4(shader_t shader, sparam_t param,
|
||||
const struct vec4 *val);
|
||||
EXPORT void shader_settexture(shader_t shader, sparam_t param, texture_t val);
|
||||
EXPORT void shader_setval(shader_t shader, sparam_t param, const void *val,
|
||||
size_t size);
|
||||
EXPORT void shader_setdefault(shader_t shader, sparam_t param);
|
||||
|
||||
#ifdef __APPLE__
|
||||
EXPORT texture_t texture_create_from_iosurface(device_t device, void *iosurf);
|
||||
EXPORT bool texture_rebind_iosurface(texture_t texture, void *iosurf);
|
||||
#endif
|
|
@ -20,12 +20,12 @@
|
|||
#include <util/darray.h>
|
||||
#include <util/threading.h>
|
||||
#include <graphics/graphics.h>
|
||||
#include <graphics/device-exports.h>
|
||||
#include <graphics/matrix4.h>
|
||||
|
||||
#include "GL/gl_obs.h"
|
||||
|
||||
#include "gl-helpers.h"
|
||||
#include "gl-exports.h"
|
||||
|
||||
struct gl_platform;
|
||||
struct gl_windowinfo;
|
||||
|
@ -384,6 +384,7 @@ struct gs_texture {
|
|||
uint32_t levels;
|
||||
bool is_dynamic;
|
||||
bool is_render_target;
|
||||
bool is_dummy;
|
||||
bool gen_mipmaps;
|
||||
|
||||
samplerstate_t cur_sampler;
|
||||
|
|
|
@ -87,18 +87,22 @@ texture_t device_create_texture(device_t device, uint32_t width,
|
|||
tex->base.gl_internal_format = convert_gs_internal_format(color_format);
|
||||
tex->base.gl_type = get_gl_format_type(color_format);
|
||||
tex->base.gl_target = GL_TEXTURE_2D;
|
||||
tex->base.is_dynamic = (flags & GS_DYNAMIC) != 0;
|
||||
tex->base.is_dynamic = (flags & GS_DYNAMIC) != 0;
|
||||
tex->base.is_render_target = (flags & GS_RENDERTARGET) != 0;
|
||||
tex->base.is_dummy = (flags & GS_GL_DUMMYTEX) != 0;
|
||||
tex->base.gen_mipmaps = (flags & GS_BUILDMIPMAPS) != 0;
|
||||
tex->width = width;
|
||||
tex->height = height;
|
||||
|
||||
if (!gl_gen_textures(1, &tex->base.texture))
|
||||
goto fail;
|
||||
if (tex->base.is_dynamic && !create_pixel_unpack_buffer(tex))
|
||||
goto fail;
|
||||
if (!upload_texture_2d(tex, data))
|
||||
goto fail;
|
||||
|
||||
if (!tex->base.is_dummy) {
|
||||
if (tex->base.is_dynamic && !create_pixel_unpack_buffer(tex))
|
||||
goto fail;
|
||||
if (!upload_texture_2d(tex, data))
|
||||
goto fail;
|
||||
}
|
||||
|
||||
return (texture_t)tex;
|
||||
|
||||
|
@ -232,3 +236,14 @@ bool texture_isrect(texture_t tex)
|
|||
|
||||
return tex2d->base.gl_target == GL_TEXTURE_RECTANGLE;
|
||||
}
|
||||
|
||||
void *texture_getobj(texture_t tex)
|
||||
{
|
||||
struct gs_texture_2d *tex2d = (struct gs_texture_2d*)tex;
|
||||
if (!is_texture_2d(tex, "texture_unmap")) {
|
||||
blog(LOG_ERROR, "texture_getobj (GL) failed");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return &tex2d->base.texture;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/******************************************************************************
|
||||
Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
|
||||
Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
@ -19,8 +19,6 @@
|
|||
|
||||
#include <util/c99defs.h>
|
||||
|
||||
extern "C" {
|
||||
|
||||
EXPORT const char *device_preprocessor_name(void);
|
||||
EXPORT device_t device_create(struct gs_init_data *data);
|
||||
EXPORT void device_destroy(device_t device);
|
||||
|
@ -63,10 +61,6 @@ EXPORT enum gs_texture_type device_gettexturetype(texture_t texture);
|
|||
EXPORT void device_load_vertexbuffer(device_t device, vertbuffer_t vertbuffer);
|
||||
EXPORT void device_load_indexbuffer(device_t device, indexbuffer_t indexbuffer);
|
||||
EXPORT void device_load_texture(device_t device, texture_t tex, int unit);
|
||||
EXPORT void device_load_cubetexture(device_t device, texture_t cubetex,
|
||||
int unit);
|
||||
EXPORT void device_load_volumetexture(device_t device, texture_t voltex,
|
||||
int unit);
|
||||
EXPORT void device_load_samplerstate(device_t device,
|
||||
samplerstate_t samplerstate, int unit);
|
||||
EXPORT void device_load_vertexshader(device_t device, shader_t vertshader);
|
||||
|
@ -126,72 +120,3 @@ EXPORT void device_frustum(device_t device, float left, float right,
|
|||
float top, float bottom, float znear, float zfar);
|
||||
EXPORT void device_projection_push(device_t device);
|
||||
EXPORT void device_projection_pop(device_t device);
|
||||
|
||||
EXPORT void swapchain_destroy(swapchain_t swapchain);
|
||||
|
||||
EXPORT void texture_destroy(texture_t tex);
|
||||
EXPORT uint32_t texture_getwidth(texture_t tex);
|
||||
EXPORT uint32_t texture_getheight(texture_t tex);
|
||||
EXPORT enum gs_color_format texture_getcolorformat(texture_t tex);
|
||||
EXPORT bool texture_map(texture_t tex, void **ptr, uint32_t *linesize);
|
||||
EXPORT void texture_unmap(texture_t tex);
|
||||
|
||||
EXPORT void cubetexture_destroy(texture_t cubetex);
|
||||
EXPORT uint32_t cubetexture_getsize(texture_t cubetex);
|
||||
EXPORT enum gs_color_format cubetexture_getcolorformat(texture_t cubetex);
|
||||
|
||||
EXPORT void volumetexture_destroy(texture_t voltex);
|
||||
EXPORT uint32_t volumetexture_getwidth(texture_t voltex);
|
||||
EXPORT uint32_t volumetexture_getheight(texture_t voltex);
|
||||
EXPORT uint32_t volumetexture_getdepth(texture_t voltex);
|
||||
EXPORT enum gs_color_format volumetexture_getcolorformat(texture_t voltex);
|
||||
|
||||
EXPORT void stagesurface_destroy(stagesurf_t stagesurf);
|
||||
EXPORT uint32_t stagesurface_getwidth(stagesurf_t stagesurf);
|
||||
EXPORT uint32_t stagesurface_getheight(stagesurf_t stagesurf);
|
||||
EXPORT enum gs_color_format stagesurface_getcolorformat(stagesurf_t stagesurf);
|
||||
EXPORT bool stagesurface_map(stagesurf_t stagesurf, uint8_t **data,
|
||||
uint32_t *linesize);
|
||||
EXPORT void stagesurface_unmap(stagesurf_t stagesurf);
|
||||
|
||||
EXPORT void zstencil_destroy(zstencil_t zstencil);
|
||||
|
||||
EXPORT void samplerstate_destroy(samplerstate_t samplerstate);
|
||||
|
||||
EXPORT void vertexbuffer_destroy(vertbuffer_t vertbuffer);
|
||||
EXPORT void vertexbuffer_flush(vertbuffer_t vertbuffer, bool rebuild);
|
||||
EXPORT struct vb_data *vertexbuffer_getdata(vertbuffer_t vertbuffer);
|
||||
|
||||
EXPORT void indexbuffer_destroy(indexbuffer_t indexbuffer);
|
||||
EXPORT void indexbuffer_flush(indexbuffer_t indexbuffer);
|
||||
EXPORT void *indexbuffer_getdata(indexbuffer_t indexbuffer);
|
||||
EXPORT size_t indexbuffer_numindices(indexbuffer_t indexbuffer);
|
||||
EXPORT enum gs_index_type indexbuffer_gettype(indexbuffer_t indexbuffer);
|
||||
|
||||
EXPORT void shader_destroy(shader_t shader);
|
||||
EXPORT int shader_numparams(shader_t shader);
|
||||
EXPORT sparam_t shader_getparambyidx(shader_t shader, uint32_t param);
|
||||
EXPORT sparam_t shader_getparambyname(shader_t shader, const char *name);
|
||||
EXPORT void shader_getparaminfo(shader_t shader, sparam_t param,
|
||||
struct shader_param_info *info);
|
||||
EXPORT sparam_t shader_getviewprojmatrix(shader_t shader);
|
||||
EXPORT sparam_t shader_getworldmatrix(shader_t shader);
|
||||
EXPORT void shader_setbool(shader_t shader, sparam_t param, bool val);
|
||||
EXPORT void shader_setfloat(shader_t shader, sparam_t param, float val);
|
||||
EXPORT void shader_setint(shader_t shader, sparam_t param, int val);
|
||||
EXPORT void shader_setmatrix3(shader_t shader, sparam_t param,
|
||||
const struct matrix3 *val);
|
||||
EXPORT void shader_setmatrix4(shader_t shader, sparam_t param,
|
||||
const struct matrix4 *val);
|
||||
EXPORT void shader_setvec2(shader_t shader, sparam_t param,
|
||||
const struct vec2 *val);
|
||||
EXPORT void shader_setvec3(shader_t shader, sparam_t param,
|
||||
const struct vec3 *val);
|
||||
EXPORT void shader_setvec4(shader_t shader, sparam_t param,
|
||||
const struct vec4 *val);
|
||||
EXPORT void shader_settexture(shader_t shader, sparam_t param, texture_t val);
|
||||
EXPORT void shader_setval(shader_t shader, sparam_t param, const void *val,
|
||||
size_t size);
|
||||
EXPORT void shader_setdefault(shader_t shader, sparam_t param);
|
||||
|
||||
}
|
|
@ -115,6 +115,7 @@ bool load_graphics_imports(struct gs_exports *exports, void *module,
|
|||
GRAPHICS_IMPORT(texture_map);
|
||||
GRAPHICS_IMPORT(texture_unmap);
|
||||
GRAPHICS_IMPORT_OPTIONAL(texture_isrect);
|
||||
GRAPHICS_IMPORT(texture_getobj);
|
||||
|
||||
GRAPHICS_IMPORT(cubetexture_destroy);
|
||||
GRAPHICS_IMPORT(cubetexture_getsize);
|
||||
|
|
|
@ -141,6 +141,7 @@ struct gs_exports {
|
|||
uint32_t *linesize);
|
||||
void (*texture_unmap)(texture_t tex);
|
||||
bool (*texture_isrect)(texture_t tex);
|
||||
void *(*texture_getobj)(texture_t tex);
|
||||
|
||||
void (*cubetexture_destroy)(texture_t cubetex);
|
||||
uint32_t (*cubetexture_getsize)(texture_t cubetex);
|
||||
|
|
|
@ -1712,6 +1712,14 @@ bool texture_isrect(texture_t tex)
|
|||
return false;
|
||||
}
|
||||
|
||||
void *texture_getobj(texture_t tex)
|
||||
{
|
||||
graphics_t graphics = thread_graphics;
|
||||
if (!graphics || !tex) return NULL;
|
||||
|
||||
return graphics->exports.texture_getobj(tex);
|
||||
}
|
||||
|
||||
void cubetexture_destroy(texture_t cubetex)
|
||||
{
|
||||
graphics_t graphics = thread_graphics;
|
||||
|
|
|
@ -399,6 +399,7 @@ EXPORT texture_t texrender_gettexture(texrender_t texrender);
|
|||
#define GS_BUILDMIPMAPS (1<<0)
|
||||
#define GS_DYNAMIC (1<<1)
|
||||
#define GS_RENDERTARGET (1<<2)
|
||||
#define GS_GL_DUMMYTEX (1<<3) /**<< texture with no allocated texture data */
|
||||
|
||||
/* ---------------- */
|
||||
/* global functions */
|
||||
|
@ -644,6 +645,11 @@ EXPORT void texture_unmap(texture_t tex);
|
|||
* GL_TEXTURE_RECTANGLE type, which doesn't use normalized texture
|
||||
* coordinates, doesn't support mipmapping, and requires address clamping */
|
||||
EXPORT bool texture_isrect(texture_t tex);
|
||||
/**
|
||||
* Gets a pointer to the context-specific object associated with the texture.
|
||||
* For example, for GL, this is a GLuint*. For D3D11, ID3D11Texture2D*.
|
||||
*/
|
||||
EXPORT void *texture_getobj(texture_t tex);
|
||||
|
||||
EXPORT void cubetexture_destroy(texture_t cubetex);
|
||||
EXPORT uint32_t cubetexture_getsize(texture_t cubetex);
|
||||
|
|
|
@ -75,6 +75,8 @@ public:
|
|||
inline T **Assign() {Clear(); return &ptr;}
|
||||
inline void Set(T *p) {Kill(); ptr = p;}
|
||||
|
||||
inline T *Get() const {return ptr;}
|
||||
|
||||
inline operator T*() const {return ptr;}
|
||||
inline T *operator->() const {return ptr;}
|
||||
|
||||
|
|
Loading…
Reference in a new issue