Portal: fix external texture

This commit is contained in:
dec05eba
2024-09-06 13:28:35 +02:00
parent 111432f7dd
commit 2682df9e0f
3 changed files with 6 additions and 10 deletions

View File

@@ -114,7 +114,6 @@ typedef void(*__GLXextFuncPtr)(void);
#define GL_TEXTURE_MIN_FILTER 0x2801
#define GL_TEXTURE_WIDTH 0x1000
#define GL_TEXTURE_HEIGHT 0x1001
#define GL_TEXTURE_INTERNAL_FORMAT 0x1003
#define GL_NEAREST 0x2600
#define GL_CLAMP_TO_EDGE 0x812F
#define GL_LINEAR 0x2601

View File

@@ -307,14 +307,6 @@ static int max_int(int a, int b) {
return a > b ? a : b;
}
static int gl_texture_get_internal_image_format(gsr_egl *egl, unsigned int texture) {
int internal_image_format = 0;
egl->glBindTexture(GL_TEXTURE_EXTERNAL_OES, texture);
egl->glGetTexLevelParameteriv(GL_TEXTURE_EXTERNAL_OES, 0, GL_TEXTURE_INTERNAL_FORMAT, &internal_image_format);
egl->glBindTexture(GL_TEXTURE_EXTERNAL_OES, 0);
return internal_image_format;
}
static int gsr_capture_portal_capture(gsr_capture *cap, AVFrame *frame, gsr_color_conversion *color_conversion) {
(void)frame;
(void)color_conversion;
@@ -343,7 +335,7 @@ static int gsr_capture_portal_capture(gsr_capture *cap, AVFrame *frame, gsr_colo
gsr_color_conversion_draw(color_conversion, using_external_image ? self->texture_map.external_texture_id : self->texture_map.texture_id,
(vec2i){target_x, target_y}, self->capture_size,
(vec2i){region.x, region.y}, self->capture_size,
0.0f, false);
0.0f, using_external_image);
if(self->params.record_cursor) {
const vec2i cursor_pos = {

View File

@@ -2705,6 +2705,11 @@ int main(int argc, char **argv) {
disable_prime_run();
}
if(strcmp(window_str, "portal") == 0 && is_using_prime_run()) {
fprintf(stderr, "Warning: use of prime-run with -w portal option is currently not supported. Disabling prime-run\n");
disable_prime_run();
}
if(video_codec_is_hdr(video_codec) && !wayland) {
fprintf(stderr, "Error: hdr video codec option %s is not available on X11\n", video_codec_to_use);
_exit(1);