berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

updating GL test

This commit is contained in:
nakst 2021-09-20 21:40:22 +01:00
parent 9b03402df8
commit 17eeb15938
3 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
apps/gl_test.c
View File

@ -1,5 +1,4 @@
// gcc -o tri tri.c -lOSMesa && ./tri
// x86_64-essence-gcc -o root/tri ports/mesa/tri.c -lOSMesa -lstdc++ -lz -g -D ESSENCE_WINDOW -D MODERN_GL
#include <GL/osmesa.h>
#include <GL/gl.h>
@ -9,6 +8,9 @@
#include <pthread.h>
#include <assert.h>
#include <string.h>
#include <math.h>
// #define MODERN_GL
#define IMAGE_WIDTH (700)
#define IMAGE_HEIGHT (600)
@ -63,13 +65,41 @@ static void (*glVertexAttribPointer)(GLuint index, GLint size, GLenum type, GLbo
#define GL_BGRA 0x80E1
#endif
#ifndef MODERN_GL
float timeMs;
void RenderLegacy() {
glClearColor(0, 0, 0, 1);
glClear(GL_COLOR_BUFFER_BIT);
glLoadIdentity();
glRotatef(fmodf(timeMs * 0.1f, 360.0f), 1, 0, 1);
glBegin(GL_TRIANGLES);
glColor4f(1, 0, 0, 1);
glVertex2f(-0.5f, -0.5f);
glColor4f(0, 1, 0, 1);
glVertex2f(0, 0.5f);
glColor4f(0, 0, 1, 1);
glVertex2f(0.5f, -0.5f);
glEnd();
glFinish();
}
#endif
#ifdef ESSENCE_WINDOW
#include <essence.h>
int CanvasCallback(EsElement *element, EsMessage *message) {
if (message->type == ES_MSG_PAINT_BACKGROUND) {
#ifndef MODERN_GL
RenderLegacy();
#endif
EsRectangle bounds = EsRectangleCenter(EsPainterBoundsInset(message->painter), ES_RECT_2S(IMAGE_WIDTH, IMAGE_HEIGHT));
EsDrawBitmap(message->painter, bounds, buffer, IMAGE_WIDTH * 4, ES_DRAW_BITMAP_OPAQUE);
} else if (message->type == ES_MSG_ANIMATE) {
message->animate.complete = false;
timeMs += message->animate.deltaMs;
EsElementRepaint(element, NULL);
return ES_HANDLED;
}
return 0;
@ -81,18 +111,6 @@ int main(int argc, char **argv) {
OSMesaContext context = OSMesaCreateContextExt(OSMESA_RGBA, 16, 0, 0, NULL);
buffer = (uint32_t *) malloc(IMAGE_WIDTH * IMAGE_HEIGHT * 4);
OSMesaMakeCurrent(context, buffer, GL_UNSIGNED_BYTE, IMAGE_WIDTH, IMAGE_HEIGHT);
glClearColor(0, 0, 0, 1);
glClear(GL_COLOR_BUFFER_BIT);
glLoadIdentity();
glBegin(GL_TRIANGLES);
glColor4f(1, 0, 0, 1);
glVertex2f(-1, -1);
glColor4f(0, 1, 0, 1);
glVertex2f(0, 1);
glColor4f(0, 0, 1, 1);
glVertex2f(1, -1);
glEnd();
#else
const int contextAttributes[] = {
OSMESA_FORMAT, OSMESA_RGBA,
@ -207,17 +225,17 @@ int main(int argc, char **argv) {
glEnableVertexAttribArray(1);
glBindBuffer(GL_ARRAY_BUFFER, squareVBO);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, squareIBO);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (const GLvoid *) 0);
glClear(GL_COLOR_BUFFER_BIT);
glVertexAttribPointer(0 /* Position */, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (const GLvoid *) 0);
glUseProgram(shader);
glClear(GL_COLOR_BUFFER_BIT);
float transform[] = { 0.5f, 0, 0, 0, /**/ 0, 0.5f, 0, 0, /**/ 0, 0, 1, 0, /**/ 0, 0, 0, 1 };
glUniformMatrix4fv(shaderTransform, 1, GL_TRUE, transform);
glUniformMatrix4fv(shaderTransform, 1, GL_FALSE, transform);
glUniform4f(shaderBlendColor, 1, 0, 1, 1);
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
#endif
glFinish();
#endif
#ifndef ESSENCE_WINDOW
FILE *out = fopen("test.ppm", "wb");
@ -239,7 +257,11 @@ int main(int argc, char **argv) {
if (message->type == ES_MSG_INSTANCE_CREATE) {
EsInstance *instance = EsInstanceCreate(message, "GL Test", -1);
EsWindowSetTitle(instance->window, "GL Test", -1);
EsCustomElementCreate(instance->window, ES_CELL_FILL, 0)->messageUser = (EsUICallback) CanvasCallback;
EsElement *canvas = EsCustomElementCreate(instance->window, ES_CELL_FILL, 0);
canvas->messageUser = (EsUICallback) CanvasCallback;
#ifndef MODERN_GL
EsElementStartAnimating(canvas);
#endif
}
}
#endif

1
apps/gl_test.ini
View File

@ -1,5 +1,6 @@
[general]
name=GL Test
permission_posix_subsystem=1
[build]
custom_compile_command=x86_64-essence-gcc -o "root/Applications/GL Test.esx" apps/gl_test.c -lOSMesa -lstdc++ -lz -g -D ESSENCE_WINDOW

10
util/build.c
View File

@ -474,6 +474,14 @@ void Run(int emulator, int log, int debug) {
const char *logFlags = log == LOG_VERBOSE ? "-d cpu_reset,int > bin/qemu_log.txt 2>&1"
: (log == LOG_NORMAL ? " > bin/qemu_log.txt 2>&1" : " > /dev/null 2>&1");
int cpuCores = atoi(GetOptionString("Emulator.Cores"));
if (debug == DEBUG_NONE) {
cpuCores = sysconf(_SC_NPROCESSORS_CONF);
if (cpuCores < 1) cpuCores = 1;
if (cpuCores > 16) cpuCores = 16;
}
CallSystemF("%s %s qemu-system-x86_64 %s%s %s -m %d %s -smp cores=%d -cpu Haswell "
" -device qemu-xhci,id=xhci -device usb-kbd,bus=xhci.0,id=mykeyboard -device usb-mouse,bus=xhci.0,id=mymouse "
" -netdev user,id=u1 -device e1000,netdev=u1 -object filter-dump,id=f1,netdev=u1,file=bin/net.dat "
@ -481,7 +489,7 @@ void Run(int emulator, int log, int debug) {
audioFlags, IsOptionEnabled("Emulator.RunWithSudo") ? "sudo " : "", drivePrefix, driveFlags, cdromFlags,
atoi(GetOptionString("Emulator.MemoryMB")),
debug ? (debug == DEBUG_NONE ? "-enable-kvm" : "-s -S") : "-s",
atoi(GetOptionString("Emulator.Cores")), audioFlags2, logFlags, usbFlags, usbFlags2, secondaryDriveFlags, biosFlags);
cpuCores, audioFlags2, logFlags, usbFlags, usbFlags2, secondaryDriveFlags, biosFlags);
} break;
case EMULATOR_BOCHS: {