Merge remote-tracking branch 'origin/miami' into lcs

* origin/miami:
  fuck
  bletch
  fixed anisotropic filtering; updated librw
  fix
This commit is contained in:
Sergeanur
2021-01-22 01:58:38 +02:00
7 changed files with 23 additions and 11 deletions

View File

@ -5,7 +5,7 @@
#define WITHD3D
#endif
#include "common.h"
#ifndef LIBRW
#ifdef ANISOTROPIC_FILTERING
#include "rpanisot.h"
#endif
#include "crossplatform.h"
@ -55,12 +55,9 @@ RwTextureGtaStreamRead(RwStream *stream)
texNumLoaded++;
}
if(tex == nil)
return nil;
#ifndef LIBRW
if(RpAnisotTextureGetMaxAnisotropy(tex) > 1)
RpAnisotTextureSetMaxAnisotropy(tex, RpAnisotTextureGetMaxAnisotropy(tex));
#ifdef ANISOTROPIC_FILTERING
if(tex && RpAnisotGetMaxSupportedMaxAnisotropy() > 1) // BUG? this was RpAnisotTextureGetMaxAnisotropy, but that doesn't make much sense
RpAnisotTextureSetMaxAnisotropy(tex, RpAnisotGetMaxSupportedMaxAnisotropy());
#endif
return tex;