Use correct uniforms when blitting menu frame with Metal
Fixes broken rgui with the Metal video driver.
This commit is contained in:
parent
a52130e368
commit
e6227f9898
|
@ -83,7 +83,6 @@
|
||||||
id<MTLSamplerState> _samplerStateNearest;
|
id<MTLSamplerState> _samplerStateNearest;
|
||||||
|
|
||||||
// other state
|
// other state
|
||||||
Uniforms _uniforms;
|
|
||||||
Uniforms _viewportMVP;
|
Uniforms _viewportMVP;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -384,8 +383,9 @@
|
||||||
|
|
||||||
if (_menu.enabled && _menu.hasFrame)
|
if (_menu.enabled && _menu.hasFrame)
|
||||||
{
|
{
|
||||||
|
[rce pushDebugGroup:@"menu frame"];
|
||||||
[_menu.view drawWithContext:_context];
|
[_menu.view drawWithContext:_context];
|
||||||
[rce setVertexBytes:&_uniforms length:sizeof(_uniforms) atIndex:BufferIndexUniforms];
|
[rce setVertexBytes:_context.uniforms length:sizeof(*_context.uniforms) atIndex:BufferIndexUniforms];
|
||||||
[rce setRenderPipelineState:_t_pipelineState];
|
[rce setRenderPipelineState:_t_pipelineState];
|
||||||
if (_menu.view.filter == RTextureFilterNearest)
|
if (_menu.view.filter == RTextureFilterNearest)
|
||||||
{
|
{
|
||||||
|
@ -396,6 +396,7 @@
|
||||||
[rce setFragmentSamplerState:_samplerStateLinear atIndex:SamplerIndexDraw];
|
[rce setFragmentSamplerState:_samplerStateLinear atIndex:SamplerIndexDraw];
|
||||||
}
|
}
|
||||||
[_menu.view drawWithEncoder:rce];
|
[_menu.view drawWithEncoder:rce];
|
||||||
|
[rce popDebugGroup];
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(HAVE_MENU)
|
#if defined(HAVE_MENU)
|
||||||
|
|
Loading…
Reference in New Issue