This commit is contained in:
Branimir Karadžić 2014-03-27 22:36:53 -07:00
parent e24ba6e1c0
commit 2f3c37d850
5 changed files with 7 additions and 5 deletions

View file

@ -1496,7 +1496,7 @@ namespace bgfx
case CommandBuffer::DestroyProgram: case CommandBuffer::DestroyProgram:
{ {
FragmentShaderHandle handle; ProgramHandle handle;
_cmdbuf.read(handle); _cmdbuf.read(handle);
rendererDestroyProgram(handle); rendererDestroyProgram(handle);

View file

@ -2637,7 +2637,7 @@ namespace bgfx
void rendererCreateFragmentShader(FragmentShaderHandle _handle, Memory* _mem); void rendererCreateFragmentShader(FragmentShaderHandle _handle, Memory* _mem);
void rendererDestroyFragmentShader(FragmentShaderHandle _handle); void rendererDestroyFragmentShader(FragmentShaderHandle _handle);
void rendererCreateProgram(ProgramHandle _handle, VertexShaderHandle _vsh, FragmentShaderHandle _fsh); void rendererCreateProgram(ProgramHandle _handle, VertexShaderHandle _vsh, FragmentShaderHandle _fsh);
void rendererDestroyProgram(FragmentShaderHandle _handle); void rendererDestroyProgram(ProgramHandle _handle);
void rendererCreateTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags, uint8_t _skip); void rendererCreateTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags, uint8_t _skip);
void rendererUpdateTextureBegin(TextureHandle _handle, uint8_t _side, uint8_t _mip); void rendererUpdateTextureBegin(TextureHandle _handle, uint8_t _side, uint8_t _mip);
void rendererUpdateTexture(TextureHandle _handle, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem); void rendererUpdateTexture(TextureHandle _handle, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem);

View file

@ -2248,7 +2248,7 @@ namespace bgfx
s_renderCtx->m_program[_handle.idx].create(s_renderCtx->m_vertexShaders[_vsh.idx], s_renderCtx->m_fragmentShaders[_fsh.idx]); s_renderCtx->m_program[_handle.idx].create(s_renderCtx->m_vertexShaders[_vsh.idx], s_renderCtx->m_fragmentShaders[_fsh.idx]);
} }
void Context::rendererDestroyProgram(FragmentShaderHandle _handle) void Context::rendererDestroyProgram(ProgramHandle _handle)
{ {
s_renderCtx->m_program[_handle.idx].destroy(); s_renderCtx->m_program[_handle.idx].destroy();
} }

View file

@ -293,6 +293,7 @@ namespace bgfx
MOZ_WEBGL_compressed_texture_s3tc, MOZ_WEBGL_compressed_texture_s3tc,
MOZ_WEBGL_depth_texture, MOZ_WEBGL_depth_texture,
NV_draw_buffers,
NVX_gpu_memory_info, NVX_gpu_memory_info,
OES_compressed_ETC1_RGB8_texture, OES_compressed_ETC1_RGB8_texture,
@ -423,6 +424,7 @@ namespace bgfx
{ "MOZ_WEBGL_compressed_texture_s3tc", false, true }, { "MOZ_WEBGL_compressed_texture_s3tc", false, true },
{ "MOZ_WEBGL_depth_texture", false, true }, { "MOZ_WEBGL_depth_texture", false, true },
{ "NV_draw_buffers", false, true }, // GLES2 extension.
{ "NVX_gpu_memory_info", false, true }, { "NVX_gpu_memory_info", false, true },
{ "OES_compressed_ETC1_RGB8_texture", false, true }, { "OES_compressed_ETC1_RGB8_texture", false, true },
@ -3225,7 +3227,7 @@ namespace bgfx
s_renderCtx->m_program[_handle.idx].create(s_renderCtx->m_vertexShaders[_vsh.idx], isValid(_fsh) ? s_renderCtx->m_fragmentShaders[_fsh.idx] : dummyFragmentShader); s_renderCtx->m_program[_handle.idx].create(s_renderCtx->m_vertexShaders[_vsh.idx], isValid(_fsh) ? s_renderCtx->m_fragmentShaders[_fsh.idx] : dummyFragmentShader);
} }
void Context::rendererDestroyProgram(FragmentShaderHandle _handle) void Context::rendererDestroyProgram(ProgramHandle _handle)
{ {
s_renderCtx->m_program[_handle.idx].destroy(); s_renderCtx->m_program[_handle.idx].destroy();
} }

View file

@ -101,7 +101,7 @@ namespace bgfx
{ {
} }
void Context::rendererDestroyProgram(FragmentShaderHandle /*_handle*/) void Context::rendererDestroyProgram(ProgramHandle /*_handle*/)
{ {
} }