Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/msvc/olcPGE3_BuildSH/olcPGE3_BuildSH.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<ClCompile Include="..\..\..\examples\olcPGE3_BatchesOfLines.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\examples\olcPGE3_BlendingModes.cpp">
Expand Down Expand Up @@ -114,7 +114,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\examples\olcPGE3_TextEntry.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\examples\olcPGE3_TextFontMap.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
Expand Down
12 changes: 6 additions & 6 deletions dev/src/draw_batch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ using namespace olc;

ImageBatch olc::Draw::CreateImageBatch(olc::Image& image)
{
PrepareImageForHW(image);
PrepareTargetForHW();

ImageBatch b;
b.task.structure = olc::Structure::List;
b.task.pImage = &image;
Expand All @@ -31,6 +28,8 @@ ImageBatch olc::Draw::CreateImageBatch(olc::Image& image)

const GPUTask& olc::Draw::Batch(olc::ImageBatch& batch, const olc::Pixel tint)
{
PrepareImageForHW(*batch.task.pImage);
PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
Expand All @@ -44,6 +43,7 @@ FilledBatch olc::Draw::CreateFilledBatch()

const GPUTask& olc::Draw::Batch(olc::FilledBatch& batch, const olc::Pixel tint)
{
PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
Expand All @@ -57,15 +57,13 @@ LineBatch olc::Draw::CreateLineBatch()

const GPUTask& olc::Draw::Batch(olc::LineBatch& batch, const olc::Pixel tint)
{
PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}

TextureBatch olc::Draw::CreateTextureBatch(olc::Image& image)
{
PrepareImageForHW(image);
PrepareTargetForHW();

TextureBatch b;
b.task.structure = olc::Structure::List;
b.task.pImage = &image;
Expand All @@ -74,6 +72,8 @@ TextureBatch olc::Draw::CreateTextureBatch(olc::Image& image)

const GPUTask& olc::Draw::Batch(olc::TextureBatch& batch, const olc::Pixel tint)
{
PrepareImageForHW(*batch.task.pImage);
PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
Expand Down
12 changes: 6 additions & 6 deletions olcPixelGameEngine3.h
Original file line number Diff line number Diff line change
Expand Up @@ -19416,9 +19416,6 @@ using namespace olc;

ImageBatch olc::Draw::CreateImageBatch(olc::Image& image)
{
PrepareImageForHW(image);
PrepareTargetForHW();

ImageBatch b;
b.task.structure = olc::Structure::List;
b.task.pImage = &image;
Expand All @@ -19427,6 +19424,8 @@ ImageBatch olc::Draw::CreateImageBatch(olc::Image& image)

const GPUTask& olc::Draw::Batch(olc::ImageBatch& batch, const olc::Pixel tint)
{
PrepareImageForHW(*batch.task.pImage);
PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
Expand All @@ -19440,6 +19439,7 @@ FilledBatch olc::Draw::CreateFilledBatch()

const GPUTask& olc::Draw::Batch(olc::FilledBatch& batch, const olc::Pixel tint)
{
PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
Expand All @@ -19453,15 +19453,13 @@ LineBatch olc::Draw::CreateLineBatch()

const GPUTask& olc::Draw::Batch(olc::LineBatch& batch, const olc::Pixel tint)
{
PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}

TextureBatch olc::Draw::CreateTextureBatch(olc::Image& image)
{
PrepareImageForHW(image);
PrepareTargetForHW();

TextureBatch b;
b.task.structure = olc::Structure::List;
b.task.pImage = &image;
Expand All @@ -19470,6 +19468,8 @@ TextureBatch olc::Draw::CreateTextureBatch(olc::Image& image)

const GPUTask& olc::Draw::Batch(olc::TextureBatch& batch, const olc::Pixel tint)
{
PrepareImageForHW(*batch.task.pImage);
PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
Expand Down
Loading