lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rm lovrTextureGetId;

This commit is contained in:
bjorn 2018-12-24 20:28:54 -08:00 committed by Bjorn Swenson
parent 55e889824f
commit fbcee9ac9c
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/opengl.c
View File

@ -1081,10 +1081,6 @@ void lovrTextureReplacePixels(Texture* texture, TextureData* textureData, int x,
}
}
GLuint lovrTextureGetId(Texture* texture) {
return texture->id;
}
int lovrTextureGetWidth(Texture* texture, int mipmap) {
return MAX(texture->width >> mipmap, 1);
}

1
src/graphics/texture.h
View File

@ -59,7 +59,6 @@ Texture* lovrTextureInitFromHandle(Texture* texture, uint32_t handle, TextureTyp
void lovrTextureDestroy(void* ref);
void lovrTextureAllocate(Texture* texture, int width, int height, int depth, TextureFormat format);
void lovrTextureReplacePixels(Texture* texture, TextureData* data, int x, int y, int slice, int mipmap);
uint32_t lovrTextureGetId(Texture* texture);
int lovrTextureGetWidth(Texture* texture, int mipmap);
int lovrTextureGetHeight(Texture* texture, int mipmap);
int lovrTextureGetDepth(Texture* texture, int mipmap);

2
src/headset/openvr.c
View File

@ -520,7 +520,7 @@ static void openvrRenderTo(void (*callback)(void*), void* userdata) {
// Submit
const Attachment* attachments = lovrCanvasGetAttachments(state.canvas, NULL);
ptrdiff_t id = lovrTextureGetId(attachments[0].texture);
ptrdiff_t id = attachments[0].texture->id;
EColorSpace colorSpace = lovrGraphicsIsGammaCorrect() ? EColorSpace_ColorSpace_Linear : EColorSpace_ColorSpace_Gamma;
Texture_t eyeTexture = { (void*) id, ETextureType_TextureType_OpenGL, colorSpace };
VRTextureBounds_t left = { 0, 0, .5, 1. };