提交 37c7db5d 编写于 作者: J jp9000

fixed some bugs and fixed a variable that wasn't declared at the top

上级 db9f8cc2
copy ..\vs\2010\x64\Debug\libobs.dll bin\64bit
copy ..\vs\2010\x64\Debug\libobs-opengl.dll bin\64bit
copy ..\vs\2010\x64\Debug\libobs-d3d11.dll bin\64bit
copy ..\vs\2010\x64\Debug\wintest.exe bin\64bit
copy ..\vs\2010\x64\Debug\test-input.dll plugins\64bit
copy ..\vs\2010\x64\Release\libobs.dll bin\64bit
copy ..\vs\2010\x64\Release\libobs-opengl.dll bin\64bit
copy ..\vs\2010\x64\Release\libobs-d3d11.dll bin\64bit
copy ..\vs\2010\x64\Release\wintest.exe bin\64bit
copy ..\vs\2010\x64\Release\test-input.dll plugins\64bit
...@@ -33,6 +33,7 @@ static void clear_textures(struct gs_device *device) ...@@ -33,6 +33,7 @@ static void clear_textures(struct gs_device *device)
void convert_sampler_info(struct gs_sampler_state *sampler, void convert_sampler_info(struct gs_sampler_state *sampler,
struct gs_sampler_info *info) struct gs_sampler_info *info)
{ {
GLint max_anisotropy_max;
convert_filter(info->filter, &sampler->min_filter, convert_filter(info->filter, &sampler->min_filter,
&sampler->mag_filter); &sampler->mag_filter);
sampler->address_u = convert_address_mode(info->address_u); sampler->address_u = convert_address_mode(info->address_u);
...@@ -40,7 +41,7 @@ void convert_sampler_info(struct gs_sampler_state *sampler, ...@@ -40,7 +41,7 @@ void convert_sampler_info(struct gs_sampler_state *sampler,
sampler->address_w = convert_address_mode(info->address_w); sampler->address_w = convert_address_mode(info->address_w);
sampler->max_anisotropy = info->max_anisotropy; sampler->max_anisotropy = info->max_anisotropy;
GLint max_anisotropy_max = 1; max_anisotropy_max = 1;
glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy_max); glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy_max);
gl_success("glGetIntegerv(GL_MAX_TEXTURE_ANISOTROPY_MAX)"); gl_success("glGetIntegerv(GL_MAX_TEXTURE_ANISOTROPY_MAX)");
......
...@@ -93,6 +93,7 @@ static inline bool ao_add_to_media(audio_t audio) ...@@ -93,6 +93,7 @@ static inline bool ao_add_to_media(audio_t audio)
struct media_output_info oi; struct media_output_info oi;
oi.obj = audio; oi.obj = audio;
oi.connect = NULL; oi.connect = NULL;
oi.format = NULL; /* TODO */
audio->output = media_output_create(&oi); audio->output = media_output_create(&oi);
if (!audio->output) if (!audio->output)
......
...@@ -66,7 +66,8 @@ media_output_t media_output_create(struct media_output_info *info) ...@@ -66,7 +66,8 @@ media_output_t media_output_create(struct media_output_info *info)
{ {
struct media_output *output; struct media_output *output;
if (!info || !info->format) /* TODO: handle format */
if (!info) // || !info->format)
return NULL; return NULL;
output = bmalloc(sizeof(struct media_output)); output = bmalloc(sizeof(struct media_output));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册