mirror of
https://github.com/TomHarte/CLK.git
synced 2024-11-26 23:52:26 +00:00
Output, at last! Though sync is clearly way off.
This commit is contained in:
parent
09df218c01
commit
3d6f20b7b9
@ -188,10 +188,15 @@ inline void Machine::update_display()
|
|||||||
|
|
||||||
if(_frameCycles >= end_of_hsync)
|
if(_frameCycles >= end_of_hsync)
|
||||||
{
|
{
|
||||||
// assert sync for the first three lines of the display
|
// assert sync for the first three lines of the display, with a break at the end for horizontal alignment
|
||||||
if(_outputPosition < end_of_hsync)
|
if(_outputPosition < end_of_hsync)
|
||||||
{
|
{
|
||||||
_crt->output_sync(end_of_hsync * crt_cycles_multiplier);
|
for(int c = 0; c < 3; c++)
|
||||||
|
{
|
||||||
|
_crt->output_sync(9 * crt_cycles_multiplier);
|
||||||
|
_crt->output_blank(9 * crt_cycles_multiplier);
|
||||||
|
_crt->output_sync(110 * crt_cycles_multiplier);
|
||||||
|
}
|
||||||
_outputPosition = end_of_hsync;
|
_outputPosition = end_of_hsync;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -387,10 +387,10 @@ static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
|
|||||||
"fragColour = 5.0 * texture(shadowMaskTexID, shadowMaskCoordinates) * vec4(yiqToRGB * vec3(y, i, q), 1.0);//sin(lateralVarying));\n";
|
"fragColour = 5.0 * texture(shadowMaskTexID, shadowMaskCoordinates) * vec4(yiqToRGB * vec3(y, i, q), 1.0);//sin(lateralVarying));\n";
|
||||||
|
|
||||||
NSString *const rgbFragmentShaderGlobals =
|
NSString *const rgbFragmentShaderGlobals =
|
||||||
@"in vec2 srcCoordinatesVarying;\n";
|
@"in vec2 srcCoordinatesVarying;\n"; // texture(shadowMaskTexID, shadowMaskCoordinates) *
|
||||||
|
|
||||||
NSString *const rgbFragmentShaderBody =
|
NSString *const rgbFragmentShaderBody =
|
||||||
@"fragColour = texture(shadowMaskTexID, shadowMaskCoordinates) * sample(srcCoordinatesVarying);//sin(lateralVarying));\n";
|
@"fragColour = sample(srcCoordinatesVarying);//sin(lateralVarying));\n";
|
||||||
|
|
||||||
switch(_signalType)
|
switch(_signalType)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user