Merge branch 'raysan5:master' into rlsw
This commit is contained in:
commit
7bbdbc5ec2
1 changed files with 130 additions and 115 deletions
|
|
@ -3336,7 +3336,7 @@ unsigned int rlLoadTexture(const void *data, int width, int height, int format,
|
|||
// Activate Trilinear filtering if mipmaps are available
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapCount); // user defined mip count would break without this.
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmapCount); // Required for user-defined mip count
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -3722,7 +3722,7 @@ unsigned char *rlReadScreenPixels(int width, int height)
|
|||
|
||||
// Flip image vertically!
|
||||
// NOTE: Alpha value has already been applied to RGB in framebuffer, we don't need it!
|
||||
for (int y = height - 1; y >= height / 2; y--)
|
||||
for (int y = height - 1; y >= height/2; y--)
|
||||
{
|
||||
for (int x = 0; x < (width*4); x += 4)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue