lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-02 04:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #127 from tim3385/master

Browse Source 
LN134: The second parameter internalFormat GL_RGB will not work on Op…
This commit is contained in:
Joey de Vries
2018-11-24 20:51:28 +01:00
committed by GitHub
parent e2d82e2cfb d07b463cfc
commit 239c456ae9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/1.getting_started/4.2.textures_combined/textures_combined.cpp
View File

@@ -131,7 +131,7 @@ int main()
if (data)
{
// note that the awesomeface.png has transparency and thus an alpha channel, so make sure to tell OpenGL the data type is of GL_RGBA
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
glGenerateMipmap(GL_TEXTURE_2D);
}
else