mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-01-27 07:38:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "libobs-d3d11: Make sure libobs knows the new adapter index"

Browse Source 
This reverts commit e62759a3fa.
This commit is contained in:
Ryan Foster
2022-12-30 11:57:06 -05:00
committed by Jim
parent 8dde4bab1e
commit 19abcbcd3c
3 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libobs-d3d11/d3d11-subsystem.cpp
View File

@@ -367,10 +367,6 @@ void gs_device::InitFactory()
#define VENDOR_ID_INTEL 0x8086
#define IGPU_MEM (512 * 1024 * 1024)
extern "C" {
EXPORT void obs_internal_set_adapter_idx_this_is_dumb(uint32_t adapter_idx);
}
void gs_device::ReorderAdapters(uint32_t &adapterIdx)
{
std::vector<uint32_t> adapterOrder;
@@ -404,8 +400,6 @@ void gs_device::ReorderAdapters(uint32_t &adapterIdx)
adapterOrder.erase(adapterOrder.begin() + iGPUIndex);
adapterOrder.insert(adapterOrder.begin(), iGPUIndex);
adapterIdx = adapterOrder[adapterIdx];
obs_internal_set_adapter_idx_this_is_dumb(adapterIdx);
}
}

2
libobs/obs-internal.h
View File

@@ -341,8 +341,6 @@ struct obs_core_video {
pthread_mutex_t task_mutex;
struct circlebuf tasks;
uint32_t adapter_index;
pthread_mutex_t mixes_mutex;
DARRAY(struct obs_core_video_mix *) mixes;
struct obs_core_video_mix *main_mix;

13
libobs/obs.c
View File

@@ -462,8 +462,6 @@ static int obs_init_graphics(struct obs_video_info *ovi)
bool success = true;
int errorcode;
video->adapter_index = ovi->adapter;
errorcode =
gs_create(&video->graphics, ovi->graphics_module, ovi->adapter);
if (errorcode != GS_SUCCESS) {
@@ -477,8 +475,6 @@ static int obs_init_graphics(struct obs_video_info *ovi)
}
}
ovi->adapter = video->adapter_index;
gs_enter_context(video->graphics);
char *filename = obs_find_data_file("default.effect");
@@ -3104,12 +3100,3 @@ bool obs_weak_object_references_object(obs_weak_object_t *weak,
{
return weak && object && weak->object == object;
}
/* this function is a hack for the annoying intel igpu + dgpu situation. I
* guess. I don't care anymore. */
EXPORT void obs_internal_set_adapter_idx_this_is_dumb(uint32_t adapter_idx)
{
if (!obs)
return;
obs->video.adapter_index = adapter_idx;
}