hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed to Image2DRegion from ImageRegion

Browse Source
This commit is contained in:
hyzboy 2021-12-15 17:35:23 +08:00
parent 156f6e98a8
commit 75e25d16c7
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMSceneGraph

@ -1 +1 @@
Subproject commit f2ac1fea2f0b7961400bd7f2744afb82f3b1c927 Subproject commit 7c8a5888a72d091e6bf6192226dec16d84d50245

2
inc/hgl/graph/VKDevice.h
View File

@ -160,7 +160,7 @@ public: //Texture
void Clear(TextureCreateInfo *); void Clear(TextureCreateInfo *);
bool ChangeTexture2D(Texture2D *,GPUBuffer *buf,const List<ImageRegion> &, VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); bool ChangeTexture2D(Texture2D *,GPUBuffer *buf,const List<Image2DRegion> &, VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
bool ChangeTexture2D(Texture2D *,GPUBuffer *buf,uint32_t left,uint32_t top,uint32_t width,uint32_t height, VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); bool ChangeTexture2D(Texture2D *,GPUBuffer *buf,uint32_t left,uint32_t top,uint32_t width,uint32_t height, VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
bool ChangeTexture2D(Texture2D *,void *data, uint32_t left,uint32_t top,uint32_t width,uint32_t height,uint32_t size,VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); bool ChangeTexture2D(Texture2D *,void *data, uint32_t left,uint32_t top,uint32_t width,uint32_t height,uint32_t size,VkPipelineStageFlags=VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);

2
src/SceneGraph/TileData.cpp
View File

@ -108,7 +108,7 @@ namespace hgl
memcpy(commit_ptr,data,bytes); memcpy(commit_ptr,data,bytes);
commit_ptr+=bytes; commit_ptr+=bytes;
ImageRegion ir; Image2DRegion ir;
ir.left =obj->uv_pixel.GetLeft(); ir.left =obj->uv_pixel.GetLeft();
ir.top =obj->uv_pixel.GetTop(); ir.top =obj->uv_pixel.GetTop();

5
src/SceneGraph/Vulkan/VKDeviceCreater.cpp
View File

@ -48,7 +48,7 @@ namespace
#define FEATURE_COPY(name) features->name=pdf.name; #define FEATURE_COPY(name) features->name=pdf.name;
FEATURE_COPY(geometryShader); FEATURE_COPY(geometryShader);
// FEATURE_COPY(multiDrawIndirect); FEATURE_COPY(multiDrawIndirect);
// FEATURE_COPY(imageCubeArray); // FEATURE_COPY(imageCubeArray);
FEATURE_COPY(samplerAnisotropy); FEATURE_COPY(samplerAnisotropy);
@ -67,7 +67,7 @@ namespace
queue_info.pQueuePriorities =queue_priorities; queue_info.pQueuePriorities =queue_priorities;
queue_info.flags =0; //如果这里写VK_DEVICE_QUEUE_CREATE_PROTECTED_BIT，会导致vkGetDeviceQueue调用崩溃 queue_info.flags =0; //如果这里写VK_DEVICE_QUEUE_CREATE_PROTECTED_BIT，会导致vkGetDeviceQueue调用崩溃
VkDeviceCreateInfo create_info={}; VkDeviceCreateInfo create_info;
CharPointerList ext_list; CharPointerList ext_list;
VkPhysicalDeviceFeatures features={}; VkPhysicalDeviceFeatures features={};
@ -76,6 +76,7 @@ namespace
create_info.sType =VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; create_info.sType =VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
create_info.pNext =nullptr; create_info.pNext =nullptr;
create_info.flags =0;
create_info.queueCreateInfoCount =1; create_info.queueCreateInfoCount =1;
create_info.pQueueCreateInfos =&queue_info; create_info.pQueueCreateInfos =&queue_info;
create_info.enabledExtensionCount =ext_list.GetCount(); create_info.enabledExtensionCount =ext_list.GetCount();

6
src/SceneGraph/Vulkan/VKDeviceTexture.cpp
View File

@ -37,7 +37,7 @@ namespace
imageSubresource.layerCount=layer_count; imageSubresource.layerCount=layer_count;
} }
void Set(ImageRegion *ir) void Set(Image2DRegion *ir)
{ {
imageOffset.x=ir->left; imageOffset.x=ir->left;
imageOffset.y=ir->top; imageOffset.y=ir->top;
@ -326,7 +326,7 @@ bool GPUDevice::CommitTexture2DMipmaps(Texture2D *tex,GPUBuffer *buf,uint32_t wi
return CommitTexture2D(tex,buf,buffer_image_copy,miplevel,VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); return CommitTexture2D(tex,buf,buffer_image_copy,miplevel,VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
} }
bool GPUDevice::ChangeTexture2D(Texture2D *tex,GPUBuffer *buf,const List<ImageRegion> &ir_list,VkPipelineStageFlags destinationStage) bool GPUDevice::ChangeTexture2D(Texture2D *tex,GPUBuffer *buf,const List<Image2DRegion> &ir_list,VkPipelineStageFlags destinationStage)
{ {
if(!tex||!buf||ir_list.GetCount()<=0) if(!tex||!buf||ir_list.GetCount()<=0)
return(false); return(false);
@ -339,7 +339,7 @@ bool GPUDevice::ChangeTexture2D(Texture2D *tex,GPUBuffer *buf,const List<ImageRe
VkDeviceSize offset=0; VkDeviceSize offset=0;
for(const ImageRegion &sp:ir_list) for(const Image2DRegion &sp:ir_list)
{ {
tp->bufferOffset = offset; tp->bufferOffset = offset;
tp->bufferRowLength = 0; tp->bufferRowLength = 0;