fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing old run loop/ref/core/etc.

Browse Source
This commit is contained in:
Ben Vanik
2014-12-19 22:04:57 -08:00
parent d70f585f5e
commit a0eebf8898
136 changed files with 461 additions and 1601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/gpu/command_processor.h
View File

@@ -10,19 +10,17 @@
#ifndef XENIA_GPU_COMMAND_PROCESSOR_H_
#define XENIA_GPU_COMMAND_PROCESSOR_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/draw_command.h>
#include <xenia/gpu/register_file.h>
#include <xenia/gpu/xenos/xenos.h>
namespace xe {
namespace gpu {
class GraphicsDriver;
class GraphicsSystem;
class CommandProcessor {
public:
CommandProcessor(GraphicsSystem* graphics_system, Memory* memory);
@@ -77,9 +75,7 @@ private:
DrawCommand draw_command_;
};
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_COMMAND_PROCESSOR_H_

7
src/xenia/gpu/d3d11/d3d11_geometry_shader.h
View File

@@ -10,19 +10,16 @@
#ifndef XENIA_GPU_D3D11_D3D11_GEOMETRY_SHADER_H_
#define XENIA_GPU_D3D11_D3D11_GEOMETRY_SHADER_H_
#include <xenia/core.h>
#include <alloy/string_buffer.h>
#include <xenia/common.h>
#include <xenia/gpu/d3d11/d3d11_gpu-private.h>
namespace xe {
namespace gpu {
namespace d3d11 {
class D3D11VertexShaderResource;
class D3D11GeometryShader {
public:
virtual ~D3D11GeometryShader();
@@ -77,10 +74,8 @@ protected:
alloy::StringBuffer* output) override;
};
} // namespace d3d11
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_D3D11_D3D11_SHADER_H_

3
src/xenia/gpu/d3d11/d3d11_gpu-private.h
View File

@@ -10,10 +10,9 @@
#ifndef XENIA_GPU_D3D11_D3D11_GPU_PRIVATE_H_
#define XENIA_GPU_D3D11_D3D11_GPU_PRIVATE_H_
#include <xenia/core.h>
#include <d3d11.h>
#include <xenia/common.h>
#include <xenia/gpu/d3d11/d3d11_gpu.h>
namespace xe {

2
src/xenia/gpu/d3d11/d3d11_gpu.h
View File

@@ -12,7 +12,7 @@
#include <memory>
#include <xenia/core.h>
#include <xenia/common.h>
namespace xe {
class Emulator;

6
src/xenia/gpu/d3d11/d3d11_graphics_driver.h
View File

@@ -10,19 +10,17 @@
#ifndef XENIA_GPU_D3D11_D3D11_GRAPHICS_DRIVER_H_
#define XENIA_GPU_D3D11_D3D11_GRAPHICS_DRIVER_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/graphics_driver.h>
#include <xenia/gpu/d3d11/d3d11_gpu-private.h>
#include <xenia/gpu/d3d11/d3d11_resource_cache.h>
#include <xenia/gpu/xenos/xenos.h>
namespace xe {
namespace gpu {
namespace d3d11 {
class D3D11GraphicsDriver : public GraphicsDriver {
public:
D3D11GraphicsDriver(
@@ -89,10 +87,8 @@ private:
} state_;
};
} // namespace d3d11
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_D3D11_D3D11_GRAPHICS_DRIVER_H_

6
src/xenia/gpu/d3d11/d3d11_graphics_system.h
View File

@@ -10,11 +10,9 @@
#ifndef XENIA_GPU_D3D11_D3D11_GRAPHICS_SYSTEM_H_
#define XENIA_GPU_D3D11_D3D11_GRAPHICS_SYSTEM_H_
#include <xenia/core.h>
#include <xenia/gpu/graphics_system.h>
#include <xenia/common.h>
#include <xenia/gpu/d3d11/d3d11_gpu-private.h>
#include <xenia/gpu/graphics_system.h>
namespace xe {
namespace gpu {

7
src/xenia/gpu/d3d11/d3d11_profiler_display.h
View File

@@ -10,17 +10,15 @@
#ifndef XENIA_GPU_D3D11_D3D11_PROFILER_DISPLAY_H_
#define XENIA_GPU_D3D11_D3D11_PROFILER_DISPLAY_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/d3d11/d3d11_gpu-private.h>
namespace xe {
namespace gpu {
namespace d3d11 {
class D3D11Window;
class D3D11ProfilerDisplay : public ProfilerDisplay {
public:
D3D11ProfilerDisplay(D3D11Window* window);
@@ -75,11 +73,8 @@ private:
} font_description_;
};
} // namespace d3d11
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_D3D11_D3D11_PROFILER_DISPLAY_H_

9
src/xenia/gpu/d3d11/d3d11_resource_cache.h
View File

@@ -10,23 +10,20 @@
#ifndef XENIA_GPU_D3D11_D3D11_RESOURCE_CACHE_H_
#define XENIA_GPU_D3D11_D3D11_RESOURCE_CACHE_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/d3d11/d3d11_gpu-private.h>
#include <xenia/gpu/resource_cache.h>
namespace xe {
namespace gpu {
namespace d3d11 {
class D3D11ResourceCache : public ResourceCache {
public:
D3D11ResourceCache(Memory* memory,
ID3D11Device* device, ID3D11DeviceContext* context);
virtual ~D3D11ResourceCache();
ID3D11Device* device() const { return device_; }
ID3D11DeviceContext* context() const { return context_; }
@@ -54,10 +51,8 @@ private:
ID3D11DeviceContext* context_;
};
} // namespace d3d11
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_D3D11_D3D11_RESOURCE_CACHE_H_

7
src/xenia/gpu/d3d11/d3d11_window.h
View File

@@ -10,17 +10,14 @@
#ifndef XENIA_GPU_D3D11_D3D11_WINDOW_H_
#define XENIA_GPU_D3D11_D3D11_WINDOW_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/d3d11/d3d11_gpu-private.h>
#include <xenia/ui/win32/win32_window.h>
namespace xe {
namespace gpu {
namespace d3d11 {
class D3D11Window : public xe::ui::win32::Win32Window {
public:
D3D11Window(
@@ -48,10 +45,8 @@ private:
ID3D11RenderTargetView* render_target_view_;
};
} // namespace d3d11
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_D3D11_D3D11_WINDOW_H_

6
src/xenia/gpu/draw_command.h
View File

@@ -10,18 +10,16 @@
#ifndef XENIA_GPU_DRAW_COMMAND_H_
#define XENIA_GPU_DRAW_COMMAND_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/buffer_resource.h>
#include <xenia/gpu/sampler_state_resource.h>
#include <xenia/gpu/shader_resource.h>
#include <xenia/gpu/texture_resource.h>
#include <xenia/gpu/xenos/xenos.h>
namespace xe {
namespace gpu {
// TODO(benvanik): move more of the enums in here?
struct DrawCommand {
xenos::XE_GPU_PRIMITIVE_TYPE prim_type;
@@ -70,9 +68,7 @@ struct DrawCommand {
size_t pixel_shader_sampler_count;
};
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_DRAW_COMMAND_H_

8
src/xenia/gpu/graphics_driver.h
View File

@@ -10,17 +10,15 @@
#ifndef XENIA_GPU_GRAPHICS_DRIVER_H_
#define XENIA_GPU_GRAPHICS_DRIVER_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/draw_command.h>
#include <xenia/gpu/register_file.h>
#include <xenia/gpu/resource_cache.h>
#include <xenia/gpu/xenos/xenos.h>
namespace xe {
namespace gpu {
class GraphicsDriver {
public:
virtual ~GraphicsDriver();
@@ -32,7 +30,7 @@ public:
virtual int Initialize() = 0;
int LoadShader(xenos::XE_GPU_SHADER_TYPE type,
uint32_t address, uint32_t length,
uint32_t address, uint32_t length,
uint32_t start);
int PrepareDraw(DrawCommand& command);
@@ -63,9 +61,7 @@ protected:
PixelShaderResource* pixel_shader_;
};
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_GRAPHICS_DRIVER_H_

2
src/xenia/gpu/graphics_system.h
View File

@@ -13,7 +13,7 @@
#include <atomic>
#include <thread>
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/emulator.h>
#include <xenia/xbox.h>

5
src/xenia/gpu/nop/nop_gpu-private.h
View File

@@ -10,11 +10,9 @@
#ifndef XENIA_GPU_NOP_NOP_GPU_PRIVATE_H_
#define XENIA_GPU_NOP_NOP_GPU_PRIVATE_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/nop/nop_gpu.h>
namespace xe {
namespace gpu {
namespace nop {
@@ -27,5 +25,4 @@ namespace nop {
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_NOP_NOP_PRIVATE_H_

2
src/xenia/gpu/nop/nop_gpu.h
View File

@@ -12,7 +12,7 @@
#include <memory>
#include <xenia/core.h>
#include <xenia/common.h>
namespace xe {
class Emulator;

7
src/xenia/gpu/nop/nop_graphics_driver.h
View File

@@ -10,18 +10,15 @@
#ifndef XENIA_GPU_NOP_NOP_GRAPHICS_DRIVER_H_
#define XENIA_GPU_NOP_NOP_GRAPHICS_DRIVER_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/graphics_driver.h>
#include <xenia/gpu/nop/nop_gpu-private.h>
#include <xenia/gpu/xenos/xenos.h>
namespace xe {
namespace gpu {
namespace nop {
class NopGraphicsDriver : public GraphicsDriver {
public:
NopGraphicsDriver(Memory* memory);
@@ -39,10 +36,8 @@ protected:
ResourceCache* resource_cache_;
};
} // namespace nop
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_NOP_NOP_GRAPHICS_DRIVER_H_

7
src/xenia/gpu/nop/nop_graphics_system.h
View File

@@ -10,17 +10,14 @@
#ifndef XENIA_GPU_NOP_NOP_GRAPHICS_SYSTEM_H_
#define XENIA_GPU_NOP_NOP_GRAPHICS_SYSTEM_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/graphics_system.h>
#include <xenia/gpu/nop/nop_gpu-private.h>
namespace xe {
namespace gpu {
namespace nop {
class NopGraphicsSystem : public GraphicsSystem {
public:
NopGraphicsSystem(Emulator* emulator);
@@ -39,10 +36,8 @@ private:
HANDLE vsync_timer_;
};
} // namespace nop
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_NOP_NOP_GRAPHICS_SYSTEM_H_

7
src/xenia/gpu/register_file.h
View File

@@ -10,13 +10,11 @@
#ifndef XENIA_GPU_REGISTER_FILE_H_
#define XENIA_GPU_REGISTER_FILE_H_
#include <xenia/core.h>
#include <xenia/common.h>
namespace xe {
namespace gpu {
enum Register {
#define XE_GPU_REGISTER(index, type, name) \
XE_GPU_REG_##name = index,
@@ -24,7 +22,6 @@ enum Register {
#undef XE_GPU_REGISTER
};
class RegisterFile {
public:
RegisterFile();
@@ -43,9 +40,7 @@ public:
}
};
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_REGISTER_FILE_H_

6
src/xenia/gpu/resource.h
View File

@@ -10,14 +10,12 @@
#ifndef XENIA_GPU_RESOURCE_H_
#define XENIA_GPU_RESOURCE_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/xenos/xenos.h>
namespace xe {
namespace gpu {
struct MemoryRange {
uint8_t* host_base;
uint32_t guest_base;
@@ -96,9 +94,7 @@ protected:
StaticResource();
};
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_RESOURCE_H_

10
src/xenia/gpu/resource_cache.h
View File

@@ -13,7 +13,7 @@
#include <map>
#include <unordered_map>
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/buffer_resource.h>
#include <xenia/gpu/resource.h>
#include <xenia/gpu/sampler_state_resource.h>
@@ -21,11 +21,9 @@
#include <xenia/gpu/texture_resource.h>
#include <xenia/gpu/xenos/xenos.h>
namespace xe {
namespace gpu {
class ResourceCache {
public:
virtual ~ResourceCache();
@@ -36,7 +34,7 @@ public:
PixelShaderResource* FetchPixelShader(
const MemoryRange& memory_range,
const PixelShaderResource::Info& info);
TextureResource* FetchTexture(
const MemoryRange& memory_range,
const TextureResource::Info& info);
@@ -92,7 +90,7 @@ protected:
resources_.push_back(resource);
return resource;
}
virtual VertexShaderResource* CreateVertexShader(
const MemoryRange& memory_range,
const VertexShaderResource::Info& info) = 0;
@@ -120,9 +118,7 @@ private:
std::multimap<uint64_t, PagedResource*> paged_resources_;
};
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_RESOURCE_CACHE_H_

6
src/xenia/gpu/xenos/packets.h
View File

@@ -10,14 +10,12 @@
#ifndef XENIA_GPU_XENOS_PACKETS_H_
#define XENIA_GPU_XENOS_PACKETS_H_
#include <xenia/core.h>
#include <xenia/common.h>
namespace xe {
namespace gpu {
namespace xenos {
// Opcodes (IT_OPCODE) for Type-3 commands in the ringbuffer.
// https://github.com/freedreno/amd-gpu/blob/master/include/api/gsl_pm4types.h
// Not sure if all of these are used.
@@ -82,10 +80,8 @@ enum Type3Opcode {
PM4_SET_BIN_SELECT_HI = 0x63,
};
} // namespace xenos
} // namespace gpu
} // namespace xe
#endif // XENIA_GPU_XENOS_PACKETS_H_

2
src/xenia/gpu/xenos/ucode.h
View File

@@ -10,7 +10,7 @@
#ifndef XENIA_GPU_XENOS_UCODE_H_
#define XENIA_GPU_XENOS_UCODE_H_
#include <xenia/core.h>
#include <xenia/common.h>
namespace xe {
namespace gpu {

3
src/xenia/gpu/xenos/ucode_disassembler.h
View File

@@ -10,8 +10,7 @@
#ifndef XENIA_GPU_XENOS_UCODE_DISASSEMBLER_H_
#define XENIA_GPU_XENOS_UCODE_DISASSEMBLER_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/xenos/ucode.h>
#include <xenia/gpu/xenos/xenos.h>

2
src/xenia/gpu/xenos/xenos.h
View File

@@ -10,7 +10,7 @@
#ifndef XENIA_GPU_XENOS_XENOS_H_
#define XENIA_GPU_XENOS_XENOS_H_
#include <xenia/core.h>
#include <xenia/common.h>
#include <xenia/gpu/xenos/ucode.h>
namespace xe {