lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-23 06:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove declarations for C interface from renderdoc_replay.h header

Browse Source 
* The functions are still exported and that's all renderdocui cares for.
* The interface is no longer to be used so gets in the way of the
  generated SWIG bindings.
This commit is contained in:
baldurk
2017-04-18 14:57:36 +01:00
parent 455ac56d5b
commit bd199ca8e6
6 changed files with 19 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoccmd/renderdoccmd.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ void DisplayRendererPreview(IReplayRenderer *renderer, uint32_t width, uint32_t
return;
rdctype::array<FetchTexture> texs;
ReplayRenderer_GetTextures(renderer, &texs);
renderer->GetTextures(&texs);
TextureDisplay d;
d.mip = 0;
renderdoccmd/renderdoccmd_android.cpp
+5 -5
View File
@@ -53,17 +53,17 @@ void DisplayRendererPreview(IReplayRenderer *renderer, TextureDisplay &displayCf
{
ANativeWindow *connectionScreenWindow = android_state->window;
IReplayOutput *out = ReplayRenderer_CreateOutput(
renderer, WindowingSystem::Android, connectionScreenWindow, ReplayOutputType::Texture);
IReplayOutput *out = renderer->CreateOutput(WindowingSystem::Android, connectionScreenWindow,
ReplayOutputType::Texture);
ReplayOutput_SetTextureDisplay(out, displayCfg);
out->SetTextureDisplay(displayCfg);
for(int i = 0; i < 100; i++)
{
ReplayRenderer_SetFrameEvent(renderer, 10000000, true);
renderer->SetFrameEvent(10000000, true);
__android_log_print(ANDROID_LOG_INFO, LOGCAT_TAG, "Frame %i", i);
ReplayOutput_Display(out);
out->Display();
usleep(100000);
}
renderdoccmd/renderdoccmd_linux.cpp
+8 -10
View File
@@ -267,7 +267,7 @@ void DisplayRendererPreview(IReplayRenderer *renderer, TextureDisplay &displayCf
xcb_map_window(connection, window);
rdctype::array<WindowingSystem> systems;
ReplayRenderer_GetSupportedWindowSystems(renderer, &systems);
renderer->GetSupportedWindowSystems(&systems);
bool xcb = false, xlib = false;
@@ -288,8 +288,7 @@ void DisplayRendererPreview(IReplayRenderer *renderer, TextureDisplay &displayCf
windowData.connection = connection;
windowData.window = window;
out = ReplayRenderer_CreateOutput(renderer, WindowingSystem::XCB, &windowData,
ReplayOutputType::Texture);
out = renderer->CreateOutput(WindowingSystem::XCB, &windowData, ReplayOutputType::Texture);
}
else if(xlib)
{
@@ -297,8 +296,7 @@ void DisplayRendererPreview(IReplayRenderer *renderer, TextureDisplay &displayCf
windowData.display = display;
windowData.window = (Drawable)window; // safe to cast types
out = ReplayRenderer_CreateOutput(renderer, WindowingSystem::Xlib, &windowData,
ReplayOutputType::Texture);
out = renderer->CreateOutput(WindowingSystem::Xlib, &windowData, ReplayOutputType::Texture);
}
else
{
@@ -310,7 +308,7 @@ void DisplayRendererPreview(IReplayRenderer *renderer, TextureDisplay &displayCf
return;
}
ReplayOutput_SetTextureDisplay(out, displayCfg);
out->SetTextureDisplay(displayCfg);
xcb_flush(connection);
@@ -325,8 +323,8 @@ void DisplayRendererPreview(IReplayRenderer *renderer, TextureDisplay &displayCf
switch(event->response_type & 0x7f)
{
case XCB_EXPOSE:
ReplayRenderer_SetFrameEvent(renderer, 10000000, true);
ReplayOutput_Display(out);
renderer->SetFrameEvent(10000000, true);
out->Display();
break;
case XCB_CLIENT_MESSAGE:
if((*(xcb_client_message_event_t *)event).data.data32[0] == (*atom_wm_delete_window).atom)
@@ -348,8 +346,8 @@ void DisplayRendererPreview(IReplayRenderer *renderer, TextureDisplay &displayCf
free(event);
}
ReplayRenderer_SetFrameEvent(renderer, 10000000, true);
ReplayOutput_Display(out);
renderer->SetFrameEvent(10000000, true);
out->Display();
usleep(100000);
}
renderdoccmd/renderdoccmd_win32.cpp
+4 -5
View File
@@ -249,10 +249,9 @@ void DisplayRendererPreview(IReplayRenderer *renderer, TextureDisplay &displayCf
ShowWindow(wnd, SW_SHOW);
UpdateWindow(wnd);
IReplayOutput *out =
ReplayRenderer_CreateOutput(renderer, WindowingSystem::Win32, wnd, ReplayOutputType::Texture);
IReplayOutput *out = renderer->CreateOutput(WindowingSystem::Win32, wnd, ReplayOutputType::Texture);
ReplayOutput_SetTextureDisplay(out, displayCfg);
out->SetTextureDisplay(displayCfg);
MSG msg;
ZeroMemory(&msg, sizeof(msg));
@@ -271,8 +270,8 @@ void DisplayRendererPreview(IReplayRenderer *renderer, TextureDisplay &displayCf
break;
// set to random event beyond the end of the frame to ensure output is marked as dirty
ReplayRenderer_SetFrameEvent(renderer, 10000000, true);
ReplayOutput_Display(out);
renderer->SetFrameEvent(10000000, true);
out->Display();
Sleep(40);
}