diff options
| author | Ray <raysan5@gmail.com> | 2015-01-08 20:32:30 +0100 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2015-01-08 20:32:30 +0100 |
| commit | e37ef10595867e4f189fff0f87db5e6fdfcfc4d0 (patch) | |
| tree | 0410f5604cc3cfc036f6c1f3ac4333ac33726660 /examples/textures_image_loading.c | |
| parent | fad81f36e4cfd37901caad8555c49c41ac65aaee (diff) | |
| parent | 4a7e522d4bb376d2277895d1d99eb0382f8bbefb (diff) | |
| download | raylib-e37ef10595867e4f189fff0f87db5e6fdfcfc4d0.tar.gz raylib-e37ef10595867e4f189fff0f87db5e6fdfcfc4d0.zip | |
Merge pull request #14 from raysan5/master
Integrate master into develop branch
Diffstat (limited to 'examples/textures_image_loading.c')
| -rw-r--r-- | examples/textures_image_loading.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/textures_image_loading.c b/examples/textures_image_loading.c index 179cf84c..b7fc2cfc 100644 --- a/examples/textures_image_loading.c +++ b/examples/textures_image_loading.c @@ -24,8 +24,8 @@ int main() // NOTE: Textures MUST be loaded after Window initialization (OpenGL context is required) - Image img = LoadImage("resources/raylib_logo.png"); // Loaded in CPU memory (RAM) - Texture2D texture = CreateTexture(img, false); // Image converted to texture, GPU memory (VRAM) + Image img = LoadImage("resources/raylib_logo.png"); // Loaded in CPU memory (RAM) + Texture2D texture = LoadTextureFromImage(img, false); // Image converted to texture, GPU memory (VRAM) UnloadImage(img); // Once image has been converted to texture and uploaded to VRAM, it can be unloaded from RAM //--------------------------------------------------------------------------------------- |