jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix up the rest of the GL code, add glew to project, add makefiles for opengl, fix makefiles so that it can be built with gcc, update project files to automatically output to the build directory

Browse Source
This commit is contained in:
jp9000
2013-10-16 23:31:18 -07:00
parent 0dfc844abc
commit dfa2dc6eab
40 changed files with 937 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libobs-d3d11/d3d11-subsystem.hpp
View File

@@ -221,14 +221,16 @@ struct gs_texture {
gs_texture_type type;
gs_device *device;
uint32_t levels;
gs_color_format format;
ComPtr<ID3D11ShaderResourceView> shaderRes;
inline gs_texture(gs_device *device, gs_texture_type type,
uint32_t levels)
uint32_t levels, gs_color_format format)
: device (device),
type (type),
levels (levels)
levels (levels),
format (format)
{
}
@@ -241,7 +243,6 @@ struct gs_texture_2d : gs_texture {
ComPtr<IDXGISurface1> gdiSurface;
uint32_t width, height;
gs_color_format format;
DXGI_FORMAT dxgiFormat;
bool isRenderTarget;
bool isGDICompatible;
@@ -250,16 +251,15 @@ struct gs_texture_2d : gs_texture {
bool genMipmaps;
HANDLE sharedHandle;
void InitSRD(vector<D3D11_SUBRESOURCE_DATA> &srd, void **data);
void InitTexture(void **data);
void InitSRD(vector<D3D11_SUBRESOURCE_DATA> &srd, const void **data);
void InitTexture(const void **data);
void InitResourceView();
void InitRenderTargets();
inline gs_texture_2d()
: gs_texture (NULL, GS_TEXTURE_2D, 0),
: gs_texture (NULL, GS_TEXTURE_2D, 0, GS_UNKNOWN),
width (0),
height (0),
format (GS_UNKNOWN),
dxgiFormat (DXGI_FORMAT_UNKNOWN),
isRenderTarget (false),
isGDICompatible (false),
@@ -272,7 +272,7 @@ struct gs_texture_2d : gs_texture {
gs_texture_2d(device_t device, uint32_t width, uint32_t height,
gs_color_format colorFormat, uint32_t levels,
void **data, uint32_t flags, gs_texture_type type,
const void **data, uint32_t flags, gs_texture_type type,
bool gdiCompatible, bool shared);
};