renamed DeviceBuffer/DeviceMemory instead of GPUBuffer/GPUMemory,

This commit is contained in:
2022-10-14 17:52:35 +08:00
parent 2e6a8e794f
commit b980457ba2
44 changed files with 150 additions and 149 deletions

View File

@@ -37,9 +37,9 @@ private:
MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr;
GPUBuffer * ubo_camera_info =nullptr;
GPUBuffer * ubo_color_material =nullptr;
GPUBuffer * ubo_line_config =nullptr;
DeviceBuffer * ubo_camera_info =nullptr;
DeviceBuffer * ubo_color_material =nullptr;
DeviceBuffer * ubo_line_config =nullptr;
Pipeline * pipeline =nullptr;
@@ -62,9 +62,9 @@ private:
return(true);
}
GPUBuffer *CreateUBO(const AnsiString &name,const VkDeviceSize size,void *data)
DeviceBuffer *CreateUBO(const AnsiString &name,const VkDeviceSize size,void *data)
{
GPUBuffer *ubo=db->CreateUBO(size,data);
DeviceBuffer *ubo=db->CreateUBO(size,data);
if(!ubo)
return(nullptr);

View File

@@ -44,8 +44,8 @@ private:
MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr;
GPUBuffer * ubo_camera_info =nullptr;
GPUBuffer * ubo_rb_config =nullptr;
DeviceBuffer * ubo_camera_info =nullptr;
DeviceBuffer * ubo_rb_config =nullptr;
Pipeline * pipeline =nullptr;
@@ -74,9 +74,9 @@ private:
return(true);
}
GPUBuffer *CreateUBO(const AnsiString &name,const VkDeviceSize size,void *data)
DeviceBuffer *CreateUBO(const AnsiString &name,const VkDeviceSize size,void *data)
{
GPUBuffer *ubo=db->CreateUBO(size,data);
DeviceBuffer *ubo=db->CreateUBO(size,data);
if(!ubo)
return(nullptr);

View File

@@ -40,10 +40,10 @@ private:
MaterialInstance * material_instance =nullptr;
Pipeline * pipeline_solid =nullptr;
GPUBuffer * ubo_atomsphere =nullptr;
DeviceBuffer * ubo_atomsphere =nullptr;
AtmosphereData atomsphere_data;
Primitive * ro_sphere =nullptr;
Primitive * ro_sphere =nullptr;
private:

View File

@@ -35,8 +35,8 @@ private:
Pipeline * sky_pipeline =nullptr;
Pipeline * solid_pipeline =nullptr;
GPUBuffer * ubo_light =nullptr;
GPUBuffer * ubo_phong =nullptr;
DeviceBuffer * ubo_light =nullptr;
DeviceBuffer * ubo_phong =nullptr;
Sampler * sampler =nullptr;
TextureCube * texture =nullptr;

View File

@@ -67,7 +67,7 @@ private:
PhongPointLight lights;
GPUBuffer *ubo_lights;
DeviceBuffer *ubo_lights;
struct SubpassParam
{

View File

@@ -26,8 +26,8 @@ private:
Pipeline * solid_pipeline =nullptr;
GPUBuffer * ubo_light =nullptr;
GPUBuffer * ubo_phong =nullptr;
DeviceBuffer * ubo_light =nullptr;
DeviceBuffer * ubo_phong =nullptr;
Sampler * sampler =nullptr;
Texture2D * texture =nullptr;

View File

@@ -17,7 +17,7 @@ class TestApp:public CameraAppFramework
{
Color4f color;
GPUBuffer *ubo_color=nullptr;
DeviceBuffer *ubo_color=nullptr;
private:

View File

@@ -49,8 +49,8 @@ private:
Pipeline * axis_pipeline =nullptr;
Pipeline * pipeline_solid =nullptr;
GPUBuffer * ubo_light =nullptr;
GPUBuffer * ubo_phong =nullptr;
DeviceBuffer * ubo_light =nullptr;
DeviceBuffer * ubo_phong =nullptr;
struct
{

View File

@@ -16,7 +16,7 @@ class TestApp:public CameraAppFramework
Camera cam;
MaterialInstance * material_instance =nullptr;
GPUBuffer * ubo_camera_info =nullptr;
DeviceBuffer * ubo_camera_info =nullptr;
};
struct:public RenderObject

View File

@@ -31,7 +31,7 @@ class TestApp:public CameraAppFramework
{
Color4f color;
GPUBuffer *ubo_color=nullptr;
DeviceBuffer *ubo_color=nullptr;
private:

View File

@@ -33,8 +33,8 @@ private:
Material * material =nullptr;
MaterialInstance * material_instance =nullptr;
GPUBuffer * ubo_color =nullptr;
GPUBuffer * ubo_sun =nullptr;
DeviceBuffer * ubo_color =nullptr;
DeviceBuffer * ubo_sun =nullptr;
Primitive * primitive =nullptr;

View File

@@ -21,7 +21,7 @@ class TestApp:public CameraAppFramework
{
SkyColorConfig scc;
GPUBuffer *ubo_color=nullptr;
DeviceBuffer *ubo_color=nullptr;
private:
@@ -32,7 +32,7 @@ private:
MaterialInstance * material_instance =nullptr;
Pipeline * pipeline =nullptr;
GPUBuffer * ubo_sky_color =nullptr;
DeviceBuffer * ubo_sky_color =nullptr;
Primitive * ro_skyphere =nullptr;

View File

@@ -36,7 +36,7 @@ class TestApp:public CameraAppFramework
{
Color4f color;
GPUBuffer *ubo_color=nullptr;
DeviceBuffer *ubo_color=nullptr;
private:

View File

@@ -22,7 +22,8 @@ constexpr float position_data[VERTEX_COUNT][2]=
};
constexpr float color_data[VERTEX_COUNT][4]=
{ {1,0,0,1},
{
{1,0,0,1},
{0,1,0,1},
{0,0,1,1}
};

View File

@@ -61,7 +61,7 @@ protected:
protected:
Camera * camera =nullptr;
GPUBuffer * ubo_camera_info =nullptr;
DeviceBuffer * ubo_camera_info =nullptr;
public:
@@ -149,7 +149,7 @@ public:
return camera->info;
}
GPUBuffer *GetCameraInfoBuffer()
DeviceBuffer *GetCameraInfoBuffer()
{
return ubo_camera_info;
}