[v2,3/4] egl: Remove duplicated logging of EGL version
diff mbox series

Message ID 20260112103740.18360-4-robert.mader@collabora.com
State New
Headers show
Series
  • GPUISP cleanups
Related show

Commit Message

Robert Mader Jan. 12, 2026, 10:37 a.m. UTC 
The line below already prints it.

Signed-off-by: Robert Mader <robert.mader@collabora.com>
---
 src/libcamera/egl.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Barnabás Pőcze Jan. 12, 2026, 10:57 a.m. UTC | #1 
2026. 01. 12. 11:37 keltezéssel, Robert Mader írta:
> The line below already prints it.
> 
> Signed-off-by: Robert Mader <robert.mader@collabora.com>
> ---

Looks good, hopefully the two are indeed consistent.

Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>


>   src/libcamera/egl.cpp | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp
> index fcaf7c58f..a88525279 100644
> --- a/src/libcamera/egl.cpp
> +++ b/src/libcamera/egl.cpp
> @@ -285,8 +285,6 @@ int eGL::initEGLContext(GBM *gbmContext)
>   
>   	EGLint numConfigs;
>   	EGLConfig config;
> -	EGLint major;
> -	EGLint minor;
>   
>   	if (!eglBindAPI(EGL_OPENGL_ES_API)) {
>   		LOG(eGL, Error) << "API bind fail";
> @@ -299,12 +297,11 @@ int eGL::initEGLContext(GBM *gbmContext)
>   		goto fail;
>   	}
>   
> -	if (eglInitialize(display_, &major, &minor) != EGL_TRUE) {
> +	if (eglInitialize(display_, nullptr, nullptr) != EGL_TRUE) {
>   		LOG(eGL, Error) << "eglInitialize fail";
>   		goto fail;
>   	}
>   
> -	LOG(eGL, Info) << "EGL: version " << major << "." << minor;
>   	LOG(eGL, Info) << "EGL: EGL_VERSION: " << eglQueryString(display_, EGL_VERSION);
>   	LOG(eGL, Info) << "EGL: EGL_VENDOR: " << eglQueryString(display_, EGL_VENDOR);
>   	LOG(eGL, Info) << "EGL: EGL_CLIENT_APIS: " << eglQueryString(display_, EGL_CLIENT_APIS);
Kieran Bingham Jan. 12, 2026, 12:24 p.m. UTC | #2 
Quoting Robert Mader (2026-01-12 10:37:39)
> The line below already prints it.
> 
> Signed-off-by: Robert Mader <robert.mader@collabora.com>

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  src/libcamera/egl.cpp | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp
> index fcaf7c58f..a88525279 100644
> --- a/src/libcamera/egl.cpp
> +++ b/src/libcamera/egl.cpp
> @@ -285,8 +285,6 @@ int eGL::initEGLContext(GBM *gbmContext)
>  
>         EGLint numConfigs;
>         EGLConfig config;
> -       EGLint major;
> -       EGLint minor;
>  
>         if (!eglBindAPI(EGL_OPENGL_ES_API)) {
>                 LOG(eGL, Error) << "API bind fail";
> @@ -299,12 +297,11 @@ int eGL::initEGLContext(GBM *gbmContext)
>                 goto fail;
>         }
>  
> -       if (eglInitialize(display_, &major, &minor) != EGL_TRUE) {
> +       if (eglInitialize(display_, nullptr, nullptr) != EGL_TRUE) {

I presume these are to support version specific runtime handling. But as
we don't have any yet... sure:


Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

>                 LOG(eGL, Error) << "eglInitialize fail";
>                 goto fail;
>         }
>  
> -       LOG(eGL, Info) << "EGL: version " << major << "." << minor;
>         LOG(eGL, Info) << "EGL: EGL_VERSION: " << eglQueryString(display_, EGL_VERSION);
>         LOG(eGL, Info) << "EGL: EGL_VENDOR: " << eglQueryString(display_, EGL_VENDOR);
>         LOG(eGL, Info) << "EGL: EGL_CLIENT_APIS: " << eglQueryString(display_, EGL_CLIENT_APIS);
> -- 
> 2.52.0
>
Bryan O'Donoghue Jan. 12, 2026, 12:32 p.m. UTC | #3 
On 12/01/2026 10:37, Robert Mader wrote:
> The line below already prints it.
> 
> Signed-off-by: Robert Mader <robert.mader@collabora.com>
> ---
>   src/libcamera/egl.cpp | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp
> index fcaf7c58f..a88525279 100644
> --- a/src/libcamera/egl.cpp
> +++ b/src/libcamera/egl.cpp
> @@ -285,8 +285,6 @@ int eGL::initEGLContext(GBM *gbmContext)
> 
>   	EGLint numConfigs;
>   	EGLConfig config;
> -	EGLint major;
> -	EGLint minor;
> 
>   	if (!eglBindAPI(EGL_OPENGL_ES_API)) {
>   		LOG(eGL, Error) << "API bind fail";
> @@ -299,12 +297,11 @@ int eGL::initEGLContext(GBM *gbmContext)
>   		goto fail;
>   	}
> 
> -	if (eglInitialize(display_, &major, &minor) != EGL_TRUE) {
> +	if (eglInitialize(display_, nullptr, nullptr) != EGL_TRUE) {
>   		LOG(eGL, Error) << "eglInitialize fail";
>   		goto fail;
>   	}
> 
> -	LOG(eGL, Info) << "EGL: version " << major << "." << minor;
>   	LOG(eGL, Info) << "EGL: EGL_VERSION: " << eglQueryString(display_, EGL_VERSION);
>   	LOG(eGL, Info) << "EGL: EGL_VENDOR: " << eglQueryString(display_, EGL_VENDOR);
>   	LOG(eGL, Info) << "EGL: EGL_CLIENT_APIS: " << eglQueryString(display_, EGL_CLIENT_APIS);
> --
> 2.52.0
> 
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>

Patch
diff mbox series 

diff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp
index fcaf7c58f..a88525279 100644
--- a/src/libcamera/egl.cpp
+++ b/src/libcamera/egl.cpp
@@ -285,8 +285,6 @@  int eGL::initEGLContext(GBM *gbmContext)
 
 	EGLint numConfigs;
 	EGLConfig config;
-	EGLint major;
-	EGLint minor;
 
 	if (!eglBindAPI(EGL_OPENGL_ES_API)) {
 		LOG(eGL, Error) << "API bind fail";
@@ -299,12 +297,11 @@  int eGL::initEGLContext(GBM *gbmContext)
 		goto fail;
 	}
 
-	if (eglInitialize(display_, &major, &minor) != EGL_TRUE) {
+	if (eglInitialize(display_, nullptr, nullptr) != EGL_TRUE) {
 		LOG(eGL, Error) << "eglInitialize fail";
 		goto fail;
 	}
 
-	LOG(eGL, Info) << "EGL: version " << major << "." << minor;
 	LOG(eGL, Info) << "EGL: EGL_VERSION: " << eglQueryString(display_, EGL_VERSION);
 	LOG(eGL, Info) << "EGL: EGL_VENDOR: " << eglQueryString(display_, EGL_VENDOR);
 	LOG(eGL, Info) << "EGL: EGL_CLIENT_APIS: " << eglQueryString(display_, EGL_CLIENT_APIS);