RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

temporary fix for texture system

Browse Source
This commit is contained in:
h4570
2022-07-28 23:54:53 +02:00
parent 19e99eee56
commit 7ec6bb71b8
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/src/renderer/core/texture/models/texture.cpp
+14
View File
@@ -12,6 +12,7 @@
#include <draw_buffers.h>
#include <gs_psm.h>
#include <stdlib.h>
#include <fastmath.h>
#include <string>
#include <sstream>
#include "renderer/core/texture/models/texture.hpp"
@@ -23,6 +24,19 @@ Texture::Texture(TextureBuilderData* t_data) {
name = t_data->name;
TYRA_ASSERT(t_data->width <= 256 && t_data->height <= 256,
"Tyra supports only 256x256 textures max!");
TYRA_ASSERT(t_data->width == 8 || t_data->width == 16 ||
t_data->width == 32 || t_data->width == 64 ||
t_data->width == 128 || t_data->width == 256,
"Texture width/height should be 8/16/32/64/128/256!");
TYRA_ASSERT(t_data->height == 8 || t_data->height == 16 ||
t_data->height == 32 || t_data->height == 64 ||
t_data->height == 128 || t_data->height == 256,
"Texture width/height should be 8/16/32/64/128/256!");
core = new TextureData(t_data->data, t_data->bpp, t_data->gsComponents,
t_data->width, t_data->height);
engine/src/renderer/core/texture/renderer_core_texture.cpp
+3 -2
View File
@@ -44,8 +44,9 @@ RendererCoreTextureBuffers RendererCoreTexture::useTexture(Texture* t_tex) {
auto allocated = getAllocatedBuffersByTextureId(t_tex->getId());
if (allocated.id != 0) return allocated;
// TODO: Dont like this..., but it works for now.
if (t_tex->getSizeInMB() > sender.getFreeVRamInMB()) {
// TODO: FIXME!
if (currentAllocations.size()) {
// if (t_tex->getSizeInMB() > sender.getFreeVRamInMB()) {
for (int i = currentAllocations.size() - 1; i >= 0; i--) {
sender.deallocate(currentAllocations[i]);
}